npm package diff
Package: @forge/cli-shared
Versions: 8.9.0-next.17 - 8.9.0-next.18
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
@@ -12,8 +12,9 @@
const HIDDEN_DIR = '.services';
exports.PROXY_SIDECAR_VOLUME_DIR = '/forge/container';
exports.CONTAINER_SERVICE_ASSETS = '.container-service-assets';
exports.K8S_AUTH_TOKEN_FILENAME = 'local-account';
+const PROXY_SIDECAR_SERVICE_NAME = 'proxy-sidecar';
class InvalidContainerServicePort extends shared_1.UserError {
constructor(serviceKey) {
super(text_1.Text.error.invalidServicePort(serviceKey));
}
@@ -44,9 +45,9 @@
const containerConfig = Object.fromEntries(containersWithTunnelConfig.map((container) => {
const config = {
container_name: container.key,
...container.tunnel?.docker,
- depends_on: [getProxySidecarContainerName(serviceKey)]
+ depends_on: [PROXY_SIDECAR_SERVICE_NAME]
};
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');
@@ -81,9 +82,9 @@
if (appId.startsWith('ari:cloud:ecosystem::app/')) {
appIdShort = appId.split('/')[1];
}
return {
- 'proxy-sidecar': {
+ [PROXY_SIDECAR_SERVICE_NAME]: {
image: proxySidecarImage,
container_name: getProxySidecarContainerName(serviceKey),
environment: [
`SERVICE_URL=http://${containerKeys[0]}:8080`,
@@ -99,9 +100,9 @@
}
};
};
const getProxySidecarContainerName = (serviceKey) => {
- return `proxy-sidecar-${serviceKey}`;
+ return `${PROXY_SIDECAR_SERVICE_NAME}-${serviceKey}`;
};
const getContainerDockerComposePath = (serviceKey) => {
const hiddenDir = path.join(process.cwd(), HIDDEN_DIR);
if (!fs.existsSync(hiddenDir)) {