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

tests: fix docker compose use #1146

Merged
merged 1 commit into from
Aug 27, 2024
Merged

tests: fix docker compose use #1146

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
2 changes: 0 additions & 2 deletions test/setup/pebble/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
pebble:
image: "ghcr.io/letsencrypt/pebble:${PEBBLE_VERSION}"
Expand Down
4 changes: 2 additions & 2 deletions test/setup/pebble/setup-pebble.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
setup_pebble() {
curl --silent --show-error https://raw.githubusercontent.com/letsencrypt/pebble/master/test/certs/pebble.minica.pem > "${GITHUB_WORKSPACE}/pebble.minica.pem"
cat "${GITHUB_WORKSPACE}/pebble.minica.pem"
docker-compose --file "${GITHUB_WORKSPACE}/test/setup/pebble/docker-compose.yml" up --detach
docker compose --file "${GITHUB_WORKSPACE}/test/setup/pebble/docker-compose.yml" up --detach
}

wait_for_pebble() {
Expand All @@ -30,4 +30,4 @@ setup_pebble_challtestserv() {
setup_pebble
wait_for_pebble
setup_pebble_challtestserv
docker-compose --file "${GITHUB_WORKSPACE}/test/setup/pebble/docker-compose.yml" logs
docker compose --file "${GITHUB_WORKSPACE}/test/setup/pebble/docker-compose.yml" logs
4 changes: 2 additions & 2 deletions test/setup/setup-boulder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ setup_boulder() {
# Modify custom rate limit
sed --in-place 's/le.wtf,le1.wtf/le1.wtf,le2.wtf,le3.wtf/g' test/rate-limit-policies.yml
fi
docker-compose build --pull
docker-compose run -d \
docker compose build --pull
docker compose run -d \
--use-aliases \
--name boulder \
-e FAKE_DNS=10.77.77.1 \
Expand Down
4 changes: 2 additions & 2 deletions test/setup/setup-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ EOF
if [[ "$ACME_CA" == 'boulder' ]]; then
# Stop and remove Boulder
docker stop boulder
docker-compose --project-name 'boulder' \
docker compose --project-name 'boulder' \
--file "${GITHUB_WORKSPACE}/go/src/github.com/letsencrypt/boulder/docker-compose.yml" \
down --volumes
docker rm boulder
elif [[ "$ACME_CA" == 'pebble' ]]; then
# Stop and remove Pebble
docker-compose --file "${GITHUB_WORKSPACE}/test/setup/pebble/docker-compose.yml" down
docker compose --file "${GITHUB_WORKSPACE}/test/setup/pebble/docker-compose.yml" down
[[ -f "${GITHUB_WORKSPACE}/pebble.minica.pem" ]] && rm "${GITHUB_WORKSPACE}/pebble.minica.pem"
fi

Expand Down