refactor(docker): Unify dev Dockerfiles

mbta · Oct 4, 2024 · ad5d052 · ad5d052
1 parent eb42f71
commit ad5d052
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/deploy/dev.yml b/deploy/dev.yml
@@ -23,7 +23,7 @@ services:
     dotcom-1:
         build:
             context: ../
-            dockerfile: ./deploy/dotcom/dev/1/Dockerfile
+            dockerfile: ./deploy/dotcom/dev/Dockerfile
         env_file:
             - ../.env
         depends_on:
@@ -36,6 +36,7 @@ services:
             - PORT=4002
             - REDIS_HOST=10.0.0.11
             - REDIS_PORT=6379
+            - SNAME=dotcom1
             - WEBPACK_PORT=8092
         expose:
             - 4002
@@ -59,7 +60,7 @@ services:
     dotcom-2:
         build:
             context: ../
-            dockerfile: ./deploy/dotcom/dev/2/Dockerfile
+            dockerfile: ./deploy/dotcom/dev/Dockerfile
         depends_on:
             dotcom-1:
                 condition: service_healthy
@@ -72,6 +73,7 @@ services:
             - PORT=4003
             - REDIS_HOST=10.0.0.11
             - REDIS_PORT=6379
+            - SNAME=dotcom2
             - WEBPACK_PORT=8093
         expose:
             - 4003

diff --git a/deploy/dotcom/dev/2/Dockerfile b/deploy/dotcom/dev/2/Dockerfile
diff --git a/deploy/dotcom/dev/1/Dockerfile → deploy/dotcom/dev/Dockerfile b/deploy/dotcom/dev/1/Dockerfile → deploy/dotcom/dev/Dockerfile
@@ -19,4 +19,4 @@ RUN mix deps.get
 RUN mix deps.compile
 RUN npm install --prefix assets --omit=optional --audit false --fund false --loglevel verbose --ignore-scripts
 
-CMD elixir --sname dotcom1 --cookie foobarbaz -S mix phx.server
+CMD elixir --sname $SNAME --cookie foobarbaz -S mix phx.server