Skip to content

Add bundle check in Dockerfile #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 13, 2022
Merged

Add bundle check in Dockerfile #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88db13c
add bundle check
stanleegoodspeed Sep 13, 2022
1e8e16e
remove stuff from compose
stanleegoodspeed Sep 13, 2022
6257577
clean up
stanleegoodspeed Sep 13, 2022
f534f02
update image tag
stanleegoodspeed Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions deploy/docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 1 addition & 5 deletions services/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"]