Skip to content
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

Update bundler before bundle install #8101

Merged
merged 14 commits into from
Jul 1, 2020
Merged

Update bundler before bundle install #8101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2194b90
Update bundler before bundle install
icarito Jun 30, 2020
0eade64
Set new bundler as default
icarito Jun 30, 2020
acaf96f
Update Rubygems
icarito Jun 30, 2020
5b04614
Add env variable pointing to right bundler
icarito Jun 30, 2020
b93f12f
Try different order for bundle installation
icarito Jun 30, 2020
e597171
Update Gems before and after bundle install
icarito Jun 30, 2020
473296e
Add newer rake gem in container
icarito Jun 30, 2020
c3305e1
Tweak rake version
icarito Jun 30, 2020
397dd49
Fix Gemfile with a generated version
icarito Jun 30, 2020
4536464
Try to call update gems only once
icarito Jul 1, 2020
23668aa
Revert Gemfile.lock to manually tweaked
icarito Jul 1, 2020
2a2850f
Revert Gemfile.lock
icarito Jul 1, 2020
ed9274d
Another try to update rake
icarito Jul 1, 2020
ce86530
Add bundle exec prefix
icarito Jul 1, 2020
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
4 changes: 3 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ RUN wget https://github.com/webnicer/chrome-downloads/raw/master/x64.deb/google-
mv chromedriver /usr/local/bin/chromedriver && \
chmod +x /usr/local/bin/chromedriver

ENV BUNDLER_VERSION=2.1.4
WORKDIR /tmp
ADD Gemfile /tmp/Gemfile
ADD Gemfile.lock /tmp/Gemfile.lock
RUN bundle update --bundler && \
RUN gem install --default bundler && \
gem update --system && \
bundle install --jobs=4

WORKDIR /app
Expand Down
14 changes: 7 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ build:
redeploy-container:
docker-compose build --pull
docker-compose run --rm web yarn install
docker-compose run --rm web bash -c "rake db:migrate && rake assets:precompile && rake tmp:cache:clear"
docker-compose run --rm web bash -c "bundle exec rake db:migrate && bundle exec rake assets:precompile && bundle exec rake tmp:cache:clear"
docker-compose down --remove-orphans
rm -f ./tmp/pids/server.pid
docker-compose up -d
Expand All @@ -19,7 +19,7 @@ redeploy-container:

deploy-container:
docker-compose run --rm web yarn install
docker-compose run --rm web bash -c "sleep 5 && rake db:migrate && rake assets:precompile"
docker-compose run --rm web bash -c "sleep 5 && bundle exec rake db:migrate && bundle exec rake assets:precompile"
rm -f ./tmp/pids/server.pid
docker-compose up -d
docker-compose exec -T web bash -c "echo 172.17.0.1 smtp >> /etc/hosts"
Expand All @@ -30,11 +30,11 @@ deploy-container:

test-container:
docker-compose up -d
docker-compose exec -T web rake db:setup
docker-compose exec -T web rake db:migrate
docker-compose exec -T web yarn install
docker-compose exec -T web rake assets:precompile
docker-compose exec -T web rake test:all
docker-compose exec -T web bundle exec rake db:setup
docker-compose exec -T web bundle exec rake db:migrate
docker-compose exec -T web bundle exec yarn install
docker-compose exec -T web bundle exec rake assets:precompile
docker-compose exec -T web bundle exec rake test:all
docker-compose exec -T web rails test -d
docker-compose down

Expand Down