raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-11 18:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove bundle exec from docker commands"

Browse Source 
This reverts commit 2d193a689406cf826e241314acd661fd87a6ae37.
This commit is contained in:
Neal Chambers
2024-11-08 23:04:53 +09:00
parent 0ec8d13641
commit 02e2214caa
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compose.yaml
View File

@@ -15,9 +15,7 @@ services:
web:
tty: true
stdin_open: true
build:
target: development
context: .
build: .
ports:
- 3000:3000
volumes:
@@ -38,10 +36,9 @@ services:
bash -c "wait-for-it -t 30 db:5432 &&
rm -f tmp/pids/server.pid &&
(bundle check || bundle install) &&
rake db:create &&
bundle exec rake db:create &&
yarn install &&
rake ofn:sample_data &&
rails s -p 3000 -b '0.0.0.0'"
bundle exec rails s -p 3000 -b '0.0.0.0'"
webpack:
build: .
command: ./bin/webpack-dev-server
@@ -72,7 +69,7 @@ services:
command: >
bash -c "wait-for-it -t 30 db:5432 &&
(bundle check || bundle install) &&
sidekiq -q mailers -q default"
bundle exec sidekiq -q mailers -q default"
volumes:
gems:
postgres:

2
docker/cop
View File

@@ -5,7 +5,7 @@
echo '-------------------------------------------------'
echo 'BEGIN: docker compose run web bundle exec rubocop'
echo '-------------------------------------------------'
docker compose run web rubocop
docker compose run web bundle exec rubocop
echo '-----------------------------------------------'
echo 'END: docker compose run web bundle exec rubocop'
echo '-----------------------------------------------'

6
docker/seed
View File

@@ -5,7 +5,7 @@
echo '-------------------------------------------------------'
echo 'BEGIN: docker compose run web bundle exec rake db:reset'
echo '-------------------------------------------------------'
docker compose run web rake db:reset
docker compose run web bundle exec rake db:reset
echo '-----------------------------------------------------'
echo 'END: docker compose run web bundle exec rake db:reset'
echo '-----------------------------------------------------'
@@ -13,7 +13,7 @@ echo '-----------------------------------------------------'
echo '--------------------------------------------------------------'
echo 'BEGIN: docker compose run web bundle exec rake db:test:prepare'
echo '--------------------------------------------------------------'
docker compose run web rake db:test:prepare
docker compose run web bundle exec rake db:test:prepare
echo '------------------------------------------------------------'
echo 'END: docker compose run web bundle exec rake db:test:prepare'
echo '------------------------------------------------------------'
@@ -21,7 +21,7 @@ echo '------------------------------------------------------------'
echo '--------------------------------------------------------------'
echo 'BEGIN: docker compose run web bundle exec rake ofn:sample_data'
echo '--------------------------------------------------------------'
docker compose run web rake ofn:sample_data
docker compose run web bundle exec rake ofn:sample_data
echo '------------------------------------------------------------'
echo 'END: docker compose run web bundle exec rake ofn:sample_data'
echo '------------------------------------------------------------'

4
docker/test
View File

@@ -9,7 +9,7 @@ DATE=`date +%Y%m%d-%H%M%S-%3N`
echo '--------------------------------------------------------------'
echo 'BEGIN: docker compose run web bundle exec rake db:test:prepare'
echo '--------------------------------------------------------------'
docker compose run web rake db:test:prepare 2>&1 | tee log/test-prepare-$DATE.log
docker compose run web bundle exec rake db:test:prepare 2>&1 | tee log/test-prepare-$DATE.log
echo '------------------------------------------------------------'
echo 'END: docker compose run web bundle exec rake db:test:prepare'
echo '------------------------------------------------------------'
@@ -17,7 +17,7 @@ echo '------------------------------------------------------------'
echo '----------------------------------------------------'
echo 'BEGIN: docker compose run web bundle exec rspec spec'
echo '----------------------------------------------------'
docker compose run web rspec --no-color spec 2>&1 | tee log/test-rspec-$DATE.log
docker compose run web bundle exec rspec --no-color spec 2>&1 | tee log/test-rspec-$DATE.log
echo '--------------------------------------------------'
echo 'END: docker compose run web bundle exec rspec spec'
echo '--------------------------------------------------'