Include shared server modules in runtime images
This commit is contained in:
@@ -35,6 +35,7 @@ RUN if [ "${INSTALL_SINGBOX}" = "true" ]; then \
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY package.json /app/package.json
|
COPY package.json /app/package.json
|
||||||
COPY src/server /app/src/server
|
COPY src/server /app/src/server
|
||||||
|
COPY src/shared /app/src/shared
|
||||||
COPY entrypoint.sh /entrypoint.sh
|
COPY entrypoint.sh /entrypoint.sh
|
||||||
|
|
||||||
RUN chmod +x /entrypoint.sh \
|
RUN chmod +x /entrypoint.sh \
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ WORKDIR /app
|
|||||||
COPY --from=web-build /src/dist /app/dist
|
COPY --from=web-build /src/dist /app/dist
|
||||||
COPY package.json /app/package.json
|
COPY package.json /app/package.json
|
||||||
COPY src/server /app/src/server
|
COPY src/server /app/src/server
|
||||||
|
COPY src/shared /app/src/shared
|
||||||
COPY entrypoint.client.sh /entrypoint.client.sh
|
COPY entrypoint.client.sh /entrypoint.client.sh
|
||||||
|
|
||||||
RUN chmod +x /entrypoint.client.sh \
|
RUN chmod +x /entrypoint.client.sh \
|
||||||
|
|||||||
@@ -7,6 +7,8 @@ const root = path.resolve(import.meta.dirname, '../..');
|
|||||||
const compose = fs.readFileSync(path.join(root, 'docker-compose.gateway.yml'), 'utf8');
|
const compose = fs.readFileSync(path.join(root, 'docker-compose.gateway.yml'), 'utf8');
|
||||||
const deploy = fs.readFileSync(path.join(root, 'scripts/deploy-gateway.sh'), 'utf8');
|
const deploy = fs.readFileSync(path.join(root, 'scripts/deploy-gateway.sh'), 'utf8');
|
||||||
const workflow = fs.readFileSync(path.join(root, '.gitea/workflows/gateway-build.yml'), 'utf8');
|
const workflow = fs.readFileSync(path.join(root, '.gitea/workflows/gateway-build.yml'), 'utf8');
|
||||||
|
const dockerfiles = ['Dockerfile', 'Dockerfile.client']
|
||||||
|
.map((file) => fs.readFileSync(path.join(root, file), 'utf8'));
|
||||||
|
|
||||||
test('gateway deploy updates control without recreating dataplane', () => {
|
test('gateway deploy updates control without recreating dataplane', () => {
|
||||||
assert.match(compose, /vpn-proxy-control:/);
|
assert.match(compose, /vpn-proxy-control:/);
|
||||||
@@ -15,3 +17,9 @@ test('gateway deploy updates control without recreating dataplane', () => {
|
|||||||
assert.match(deploy, /up -d --no-deps --wait[^\n]+vpn-proxy-control/);
|
assert.match(deploy, /up -d --no-deps --wait[^\n]+vpn-proxy-control/);
|
||||||
assert.match(workflow, /UPDATE_DATAPLANE="\$\{UPDATE_DATAPLANE\}"/);
|
assert.match(workflow, /UPDATE_DATAPLANE="\$\{UPDATE_DATAPLANE\}"/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('runtime images include shared server modules', () => {
|
||||||
|
for (const dockerfile of dockerfiles) {
|
||||||
|
assert.match(dockerfile, /COPY src\/shared \/app\/src\/shared/);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user