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

Jump to bottom

Fix db_migrate service failing to find db-migrate-seed.sh #6220

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Fix db_migrate service failing to find db-migrate-seed.sh #6220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60511fd
Remove -l from sh in docker commands
dlpierce Aug 25, 2023
e3ba507
Do not use login shell in koppie either
dlpierce Aug 25, 2023
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
6 changes: 3 additions & 3 deletions docker-compose-koppie.yml
View file
Open in desktop
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
View file
Open in desktop
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