diff --git a/deploy/dev.yml b/deploy/dev.yml index e6c1dc2e69..17c7dc9798 100644 --- 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 deleted file mode 100644 index 6fc4720f8b..0000000000 --- a/deploy/dotcom/dev/2/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM hexpm/elixir:1.17.0-erlang-27.0-debian-buster-20240513-slim - -RUN apt-get update && apt-get install -y curl git make build-essential inotify-tools -RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - -RUN apt-get install -y nodejs - -WORKDIR /app - -COPY mix.exs . -COPY mix.lock . -COPY package.json . -COPY assets/package.json ./assets/package.json -COPY assets/package-lock.json ./assets/package-lock.json - -RUN mix local.hex --force -RUN mix local.rebar --force - -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 dotcom2 --cookie foobarbaz -S mix phx.server diff --git a/deploy/dotcom/dev/1/Dockerfile b/deploy/dotcom/dev/Dockerfile similarity index 90% rename from deploy/dotcom/dev/1/Dockerfile rename to deploy/dotcom/dev/Dockerfile index ff8be7c88e..e8e501f7dd 100644 --- a/deploy/dotcom/dev/1/Dockerfile +++ b/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