Merge pull request #33 from backstage/djamaile-patch-1

fix: change order of merging configs
backstage · Jan 10, 2024 · 2e04292 · 2e04292
2 parents ebc537b + 0942039
commit 2e04292
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/programs/aws.ts b/src/programs/aws.ts
@@ -185,9 +185,10 @@ export const AWSProgram = (opts: OptionValues) => {
             DATABASE_PASSWORD: db?.masterPassword,
           };
 
-    const CONTAINER_SERVICE_URL = containerService.url.apply(url =>
-      url.endsWith('/') ? url.slice(0, -1) : url
+    const containerServiceUrl = containerService.url.apply(url =>
+      url.endsWith('/') ? url.slice(0, -1) : url,
     );
+
     /* eslint-disable no-new */
     new aws.lightsail.ContainerServiceDeploymentVersion(
       `${opts.stack}-deployment`,
@@ -206,7 +207,7 @@ export const AWSProgram = (opts: OptionValues) => {
                     APP_CONFIG_app_baseUrl: containerService.url,
                   }
                 : {
-                    BACKSTAGE_HOST: CONTAINER_SERVICE_URL,
+                    BACKSTAGE_HOST: containerServiceUrl,
                   }),
               ...providedEnvironmentVariables,
               ...(opts.withDb || opts.quickstart ? DB_ENVS : {}),

diff --git a/templates/pulumi/Dockerfile b/templates/pulumi/Dockerfile
@@ -37,4 +37,4 @@ RUN echo "techdocs:" >> app-config.deployment.yaml
 RUN echo "    generator:" >> app-config.deployment.yaml
 RUN echo "        runIn: 'local'" >> app-config.deployment.yaml
 
-CMD ["node", "packages/backend", "--config",  "app-config.deployment.yaml", "--config", "app-config.yaml"]
+CMD ["node", "packages/backend", "--config",  "app-config.yaml", "--config", "app-config.deployment.yaml"]