diff --git a/locales/en.yml b/locales/en.yml
index f36e2af0..371260d2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -7579,6 +7579,7 @@ tools:
label-docker-compose-file: 'Docker Compose file:'
placeholder-paste-your-docker-compose-yaml-here: Paste your docker-compose YAML here...
title-extract-env: Extract .env
+ title-updated-docker-compose: 'Updated Docker Compose:'
emv-tlv-decoder:
title: EMV TLV decoder
description: >-
diff --git a/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.test.ts b/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.test.ts
index 2959de5b..55c0c09b 100644
--- a/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.test.ts
+++ b/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.test.ts
@@ -15,12 +15,26 @@ services:
- POSTGRES_PASSWORD=secret
`;
const result = extractEnvFromCompose(yaml);
- expect(result).toContain('# web');
- expect(result).toContain('PORT=3000');
- expect(result).toContain('DEBUG=true');
- expect(result).toContain('# db');
- expect(result).toContain('POSTGRES_USER=admin');
- expect(result).toContain('POSTGRES_PASSWORD=secret');
+ expect(result).to.deep.eq({
+ dotenv: `# web
+PORT=3000
+DEBUG=true
+
+# db
+POSTGRES_USER=admin
+POSTGRES_PASSWORD=secret
+`,
+ updatedCompose: `services:
+ web:
+ environment:
+ - PORT=\${PORT}
+ - DEBUG=\${DEBUG}
+ db:
+ environment:
+ - POSTGRES_USER=\${POSTGRES_USER}
+ - POSTGRES_PASSWORD=\${POSTGRES_PASSWORD}
+`,
+ });
});
it('handles object format', () => {
@@ -32,9 +46,40 @@ services:
API_KEY: abc123
`;
const result = extractEnvFromCompose(yaml);
- expect(result).toContain('# api');
- expect(result).toContain('NODE_ENV=production');
- expect(result).toContain('API_KEY=abc123');
+ expect(result).to.deep.eq({
+ dotenv: `# api
+NODE_ENV=production
+API_KEY=abc123
+`,
+ updatedCompose: `services:
+ api:
+ environment:
+ - NODE_ENV=\${NODE_ENV}
+ - API_KEY=\${API_KEY}
+`,
+ });
+ });
+
+ it('handles with already existing environment variables', () => {
+ const yaml = `
+services:
+ api:
+ environment:
+ NODE_ENV: \${NODE_ENV}
+ API_KEY: abc123
+`;
+ const result = extractEnvFromCompose(yaml);
+ expect(result).to.deep.eq({
+ dotenv: `# api
+API_KEY=abc123
+`,
+ updatedCompose: `services:
+ api:
+ environment:
+ - NODE_ENV=\${NODE_ENV}
+ - API_KEY=\${API_KEY}
+`,
+ });
});
it('handles mixed formats and null values', () => {
@@ -51,13 +96,28 @@ services:
FOO2: null
`;
const result = extractEnvFromCompose(yaml);
- expect(result).toContain('# mixed');
- expect(result).toContain('FOO=bar');
- expect(result).toContain('EMPTY=');
- expect(result).toContain('# obj');
- expect(result).toContain('BAR=baz');
- expect(result).toContain('FOO2=');
- expect(result).toContain('FOO3=');
+ expect(result).to.deep.eq({
+ dotenv: `# mixed
+FOO=bar
+EMPTY=
+FOO3=null
+
+# obj
+BAR=baz
+FOO2=
+`,
+ updatedCompose: `services:
+ mixed:
+ environment:
+ - FOO=\${FOO}
+ - EMPTY=\${EMPTY}
+ - FOO3=\${FOO3}
+ obj:
+ environment:
+ - BAR=\${BAR}
+ - FOO2=\${FOO2}
+`,
+ });
});
it('returns empty string if no env vars', () => {
@@ -67,11 +127,20 @@ services:
image: nginx
`;
const result = extractEnvFromCompose(yaml);
- expect(result).toBe('');
+ expect(result).to.deep.eq({
+ dotenv: '',
+ updatedCompose: `services:
+ noenv:
+ image: nginx
+`,
+ });
});
it('handles empty input gracefully', () => {
const result = extractEnvFromCompose('');
- expect(result).toBe('');
+ expect(result).to.deep.eq({
+ dotenv: '',
+ updatedCompose: '',
+ });
});
});
diff --git a/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.ts b/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.ts
index 33109b16..e1cbac5b 100644
--- a/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.ts
+++ b/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.service.ts
@@ -1,6 +1,9 @@
import yaml from 'yaml';
export function extractEnvFromCompose(yamlInput: string) {
+ if (!yamlInput?.trim()) {
+ return { dotenv: '', updatedCompose: '' };
+ }
const doc = yaml.parse(yamlInput);
const envLines: string[] = [];
@@ -11,25 +14,42 @@ export function extractEnvFromCompose(yamlInput: string) {
}
const serviceVars: string[] = [];
+ const serviceReplacementVars: string[] = [];
if (Array.isArray(env)) {
for (const entry of env) {
const [key, value = ''] = entry.split('=');
+ if (value?.trim().match(/^\$\{.*?\}$/)) {
+ serviceReplacementVars.push(entry);
+ continue;
+ }
serviceVars.push(`${key.trim()}=${value.trim()}`);
+ serviceReplacementVars.push(`${key.trim()}=\$\{${key.trim()}\}`);
}
- }
- else if (typeof env === 'object') {
+ } else if (typeof env === 'object') {
for (const [key, value] of Object.entries(env)) {
+ if (
+ value
+ ?.toString()
+ .trim()
+ .match(/^\$\{.*?\}$/)
+ ) {
+ serviceReplacementVars.push(`${key.trim()}=${(value ?? '').toString().trim()}`);
+ continue;
+ }
serviceVars.push(`${key.trim()}=${(value ?? '').toString().trim()}`);
+ serviceReplacementVars.push(`${key.trim()}=\$\{${key.trim()}\}`);
}
}
if (serviceVars.length) {
+ (service as { environment: any }).environment = serviceReplacementVars;
+
envLines.push(`# ${serviceName}`);
envLines.push(...serviceVars);
envLines.push(''); // Add spacing between services
}
}
- return envLines.join('\n');
+ return { dotenv: envLines.join('\n'), updatedCompose: yaml.stringify(doc) };
}
diff --git a/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.vue b/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.vue
index 5e69d0ab..ae056bb1 100644
--- a/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.vue
+++ b/src/tools/docker-compose-to-env-file/docker-compose-to-env-file.vue
@@ -17,8 +17,7 @@ const yamlInput = ref(`services:
const envOutput = computed(() => {
try {
return extractEnvFromCompose(yamlInput.value);
- }
- catch (e: any) {
+ } catch (e: any) {
return e.toString();
}
});
@@ -36,12 +35,10 @@ const envOutput = computed(() => {
/>
-
+
+
+
+