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

Upgrade to Docker Compose v2 #402

Merged
merged 2 commits into from
Mar 9, 2023
Merged

Upgrade to Docker Compose v2 #402

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b089b7c
Upgrade to Docker Compose v2
yanokwa Mar 7, 2023
f07cce2
Merge branch 'next' into remove-docker-compose
yanokwa Mar 9, 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 .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
DOMAIN=local
SYSADMIN_EMAIL=no-reply@getodk.org' > .env

- run: docker-compose build
- run: docker compose build

- run:
# we allow a long retry period for the first check because the first-run
# nginx setup could take several minutes due to key generation.
name: Verify frontend and backend load
command: |
set -x
docker-compose up -d
CONTAINER_NAME=$(docker inspect -f '{{.Name}}' $(docker-compose ps -q nginx) | cut -c2-)
docker compose up -d
CONTAINER_NAME=$(docker inspect -f '{{.Name}}' $(docker compose ps -q nginx) | cut -c2-)
docker run --network container:$CONTAINER_NAME \
appropriate/curl -4 --insecure --retry 30 --retry-delay 10 --retry-connrefused https://localhost/ \
| tee /dev/tty \
Expand Down
15 changes: 0 additions & 15 deletions files/docker-compose@.service
View file
Open in desktop

This file was deleted.