diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml index 427dba47..b812ddec 100644 --- a/deploy/docker-compose/docker-compose.yml +++ b/deploy/docker-compose/docker-compose.yml @@ -22,8 +22,7 @@ services: networks: - storedog-net web: - image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.1 - command: bash -c "rm -rf tmp/pids/server.pid && bundle exec rails s -b 0.0.0.0 -p 4000" + image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.4 depends_on: - 'postgres' - 'redis' @@ -39,7 +38,7 @@ services: networks: - storedog-net worker: - image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.1 + image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.4 command: bundle exec sidekiq -C config/sidekiq.yml depends_on: - 'postgres' @@ -55,7 +54,7 @@ services: networks: - storedog-net ads: - image: public.ecr.aws/x2b9z2t7/storedog/ads:1.0.1 + image: public.ecr.aws/x2b9z2t7/storedog/ads:1.0.4 command: flask run --port=${ADS_PORT} --host=0.0.0.0 depends_on: - postgres @@ -75,7 +74,7 @@ services: networks: - storedog-net discounts: - image: public.ecr.aws/x2b9z2t7/storedog/discounts:1.0.1 + image: public.ecr.aws/x2b9z2t7/storedog/discounts:1.0.4 command: flask run --port=${DISCOUNTS_PORT} --host=0.0.0.0 depends_on: - postgres diff --git a/docker-compose.yml b/docker-compose.yml index 65b02a30..5b584fa4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,6 @@ services: - 'redis' build: context: ./services/backend - command: bash -c "rm -rf tmp/pids/server.pid && bundle exec rails s -b 0.0.0.0 -p 4000" ports: - '${DOCKER_HOST_WEB_PORT:-4000}:4000' volumes: diff --git a/services/backend/Dockerfile b/services/backend/Dockerfile index 0b670980..4dd3595c 100644 --- a/services/backend/Dockerfile +++ b/services/backend/Dockerfile @@ -20,9 +20,6 @@ RUN apt-get clean -qy \ RUN mkdir /app WORKDIR /app -COPY package.json yarn.lock -RUN yarn install - # install specific version of bundler RUN gem install bundler -v 2.2.32 @@ -36,10 +33,9 @@ ENV PATH="${BUNDLE_BIN}:${PATH}" COPY . . RUN bundle install -RUN bundler install RUN yarn install RUN yarn build EXPOSE 4000 -CMD ["/bin/bash", "-c", "bundle exec rails s -b 0.0.0.0 -p 4000"] +CMD ["/bin/bash", "-c", "rm -rf tmp/pids/server.pid && (bundle check || bundle install) && bundle exec rails s -b 0.0.0.0 -p 4000"] \ No newline at end of file