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

Modernize docker compose usage & language #4125

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Modernize docker compose usage & language #4125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion .github/docker-tests/docker-compose.yml → .github/docker-tests/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "2.1"
services:
taxonworks:
build: ./docker-image-taxonworks
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml → compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# docker-compose targets development only
# docker compose targets development only
#
version: '2'
services:
app:
build:
Expand Down Expand Up @@ -30,6 +29,7 @@ services:
- '0.0.0.0:15432:5432'
volumes:
- pg12:/var/lib/postgresql/data
- ./unzip:/mnt/unzip
webpack:
build:
context: .
Expand Down
2 changes: 1 addition & 1 deletion exe/docker_compose_start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function wait_for_db() {
done
}
# Could do sanity check of environment here
# * Raise a warning of the database.yml file looks like it is setup for docker-compose
# * Raise a warning if the database.yml file looks like it is setup for docker compose

wait_for_db "postgres10_legacy"
wait_for_db "db"
Expand Down