npm package diff
Package: @forge/cli-shared
Versions: 8.9.0-next.9 - 8.9.0-next.10
File: package/out/tunnel/docker-compose-lifecycle.js
Index: package/out/tunnel/docker-compose-lifecycle.js
===================================================================
--- package/out/tunnel/docker-compose-lifecycle.js
+++ package/out/tunnel/docker-compose-lifecycle.js
@@ -43,9 +43,10 @@
}
const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) => {
const config = {
container_name: container.key,
- ...container.tunnel?.docker
+ ...container.tunnel?.docker,
+ depends_on: [getProxySidecarContainerName(serviceKey)]
};
const envArray = container?.tunnel?.docker.environment ?? [];
const filteredEnvArray = envArray.filter((envVar) => !envVar.startsWith('FORGE_EGRESS_PROXY_URL='));
filteredEnvArray.push('FORGE_EGRESS_PROXY_URL=http://proxy-sidecar:7072');
@@ -82,9 +83,9 @@
}
return {
'proxy-sidecar': {
image: proxySidecarImage,
- container_name: `proxy-sidecar-${serviceKey}`,
+ container_name: getProxySidecarContainerName(serviceKey),
environment: [
`SERVICE_URL=http://${containerKeys[0]}:8080`,
`FOP_BASE_URL=${fopBaseUrl}`,
`APP_ID=ari:cloud:ecosystem::app/${appIdShort}`,
@@ -93,13 +94,15 @@
`IS_LOCAL_DEV=true`,
`K8S_AUTH_TOKEN_PATH=${exports.PROXY_SIDECAR_VOLUME_DIR}/${exports.K8S_AUTH_TOKEN_FILENAME}`
],
volumes: [`../${exports.CONTAINER_SERVICE_ASSETS}:${exports.PROXY_SIDECAR_VOLUME_DIR}:ro`],
- ports: [`${port}:${tunnel_options_1.DEFAULT_PROXY_INGRESS_PORT}`],
- depends_on: containerKeys
+ ports: [`${port}:${tunnel_options_1.DEFAULT_PROXY_INGRESS_PORT}`]
}
};
};
+const getProxySidecarContainerName = (serviceKey) => {
+ return `proxy-sidecar-${serviceKey}`;
+};
const getContainerDockerComposePath = (serviceKey) => {
const hiddenDir = path.join(process.cwd(), HIDDEN_DIR);
if (!fs.existsSync(hiddenDir)) {
fs.mkdirSync(hiddenDir, { recursive: true });