From 88db13c6b3cdbf36745598a7250baa5bbc145f7a Mon Sep 17 00:00:00 2001 From: Colin Cole Date: Tue, 13 Sep 2022 09:11:47 -0400 Subject: [PATCH 1/4] add bundle check --- docker-compose.yml | 1 - services/backend/Dockerfile | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) 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..58825f9d 100644 --- a/services/backend/Dockerfile +++ b/services/backend/Dockerfile @@ -33,13 +33,14 @@ ENV BUNDLE_GEMFILE=/app/Gemfile \ GEM_HOME=/bundle ENV PATH="${BUNDLE_BIN}:${PATH}" +COPY Gemfile Gemfile.lock ./ +RUN bundle install + 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 From 1e8e16eee4f1afdefc4d2d6956d091493e40c772 Mon Sep 17 00:00:00 2001 From: Colin Cole Date: Tue, 13 Sep 2022 09:58:43 -0400 Subject: [PATCH 2/4] remove stuff from compose --- docker-compose.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b584fa4..100941b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,14 +25,9 @@ services: depends_on: - 'postgres' - 'redis' - build: - context: ./services/backend + image: public.ecr.aws/x2b9z2t7/storedog/backend:test-2 ports: - '${DOCKER_HOST_WEB_PORT:-4000}:4000' - volumes: - - 'bundle_cache:/bundle' - - './services/backend:/app' - - .env:/app/.env environment: REDIS_URL: redis://redis:6379/0 DB_HOST: postgres @@ -45,13 +40,8 @@ services: - 'postgres' - 'redis' - 'web' - build: - context: ./services/backend + image: public.ecr.aws/x2b9z2t7/storedog/backend:test-2 command: bundle exec sidekiq -C config/sidekiq.yml - volumes: - - 'bundle_cache:/bundle' - - './services/backend:/app' - - .env:/app/.env environment: REDIS_URL: redis://redis:6379/0 DB_HOST: postgres @@ -127,7 +117,6 @@ services: volumes: redis: postgres: - bundle_cache: networks: storedog-net: From 62575773083b1240cf8879ea2e77c197c0de7bb1 Mon Sep 17 00:00:00 2001 From: Colin Cole Date: Tue, 13 Sep 2022 11:17:25 -0400 Subject: [PATCH 3/4] clean up --- deploy/docker-compose/docker-compose.yml | 5 ++--- docker-compose.yml | 15 +++++++++++++-- services/backend/Dockerfile | 7 +------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml index 427dba47..5177ac87 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:test-2 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:test-2 command: bundle exec sidekiq -C config/sidekiq.yml depends_on: - 'postgres' diff --git a/docker-compose.yml b/docker-compose.yml index 100941b2..5b584fa4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,9 +25,14 @@ services: depends_on: - 'postgres' - 'redis' - image: public.ecr.aws/x2b9z2t7/storedog/backend:test-2 + build: + context: ./services/backend ports: - '${DOCKER_HOST_WEB_PORT:-4000}:4000' + volumes: + - 'bundle_cache:/bundle' + - './services/backend:/app' + - .env:/app/.env environment: REDIS_URL: redis://redis:6379/0 DB_HOST: postgres @@ -40,8 +45,13 @@ services: - 'postgres' - 'redis' - 'web' - image: public.ecr.aws/x2b9z2t7/storedog/backend:test-2 + build: + context: ./services/backend command: bundle exec sidekiq -C config/sidekiq.yml + volumes: + - 'bundle_cache:/bundle' + - './services/backend:/app' + - .env:/app/.env environment: REDIS_URL: redis://redis:6379/0 DB_HOST: postgres @@ -117,6 +127,7 @@ services: volumes: redis: postgres: + bundle_cache: networks: storedog-net: diff --git a/services/backend/Dockerfile b/services/backend/Dockerfile index 58825f9d..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 @@ -33,11 +30,9 @@ ENV BUNDLE_GEMFILE=/app/Gemfile \ GEM_HOME=/bundle ENV PATH="${BUNDLE_BIN}:${PATH}" -COPY Gemfile Gemfile.lock ./ -RUN bundle install - COPY . . +RUN bundle install RUN yarn install RUN yarn build From f534f025830b4f485d2d1e987e3c4e6d3b84fe13 Mon Sep 17 00:00:00 2001 From: Colin Cole Date: Tue, 13 Sep 2022 11:20:02 -0400 Subject: [PATCH 4/4] update image tag --- deploy/docker-compose/docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/docker-compose/docker-compose.yml b/deploy/docker-compose/docker-compose.yml index 5177ac87..b812ddec 100644 --- a/deploy/docker-compose/docker-compose.yml +++ b/deploy/docker-compose/docker-compose.yml @@ -22,7 +22,7 @@ services: networks: - storedog-net web: - image: public.ecr.aws/x2b9z2t7/storedog/backend:test-2 + image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.4 depends_on: - 'postgres' - 'redis' @@ -38,7 +38,7 @@ services: networks: - storedog-net worker: - image: public.ecr.aws/x2b9z2t7/storedog/backend:test-2 + image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.4 command: bundle exec sidekiq -C config/sidekiq.yml depends_on: - 'postgres' @@ -54,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 @@ -74,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