Skip to content

Commit

Permalink
Fix db_migrate service failing to find db-migrate-seed.sh (#6220)
Browse files Browse the repository at this point in the history
* Remove -l from sh in docker commands

Something (going Alpine 16 => 18 maybe?) has changed the state of PATH in docker when using `sh -l -c` to run commands. Not using a login shell is a fix.

* Do not use login shell in koppie either
  • Loading branch information
dlpierce authored Aug 25, 2023
1 parent c1dc0f6 commit 90f5e0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions docker-compose-koppie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- EXTRA_APK_PACKAGES=git less chromium
- APP_PATH=.koppie
image: ghcr.io/samvera/koppie
command: sh -l -c 'bundle && yarn && bundle exec puma -v -b tcp://0.0.0.0:3000'
command: sh -c 'bundle && yarn && bundle exec puma -v -b tcp://0.0.0.0:3000'
stdin_open: true
tty: true
user: root
Expand Down Expand Up @@ -46,7 +46,7 @@ services:
args:
- APP_PATH=.koppie
image: ghcr.io/samvera/koppie-worker
command: sh -l -c 'bundle && bundle exec sidekiq'
command: sh -c 'bundle && bundle exec sidekiq'
user: root
env_file:
- .koppie/.env
Expand Down Expand Up @@ -78,7 +78,7 @@ services:
user: root
env_file:
- .koppie/.env
command: sh -l -c 'bundle && db-migrate-seed.sh'
command: sh -c 'bundle && db-migrate-seed.sh'
depends_on:
- postgres
volumes:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
args:
- EXTRA_APK_PACKAGES=git less chromium
image: ghcr.io/samvera/dassie
command: sh -l -c 'bundle && bundle exec puma -v -b tcp://0.0.0.0:3000'
command: sh -c 'bundle && bundle exec puma -v -b tcp://0.0.0.0:3000'
stdin_open: true
tty: true
user: root
Expand Down Expand Up @@ -42,7 +42,7 @@ services:
context: .
target: hyrax-engine-dev-worker
image: ghcr.io/samvera/dassie-worker
command: sh -l -c 'bundle && bundle exec sidekiq'
command: sh -c 'bundle && bundle exec sidekiq'
user: root
env_file:
- .dassie/.env
Expand Down Expand Up @@ -73,7 +73,7 @@ services:
user: root
env_file:
- .dassie/.env
command: sh -l -c 'bundle && db-migrate-seed.sh'
command: sh -c 'bundle && db-migrate-seed.sh'
depends_on:
- postgres
volumes:
Expand Down

0 comments on commit 90f5e0b

Please sign in to comment.