mirror/docker-letsencrypt-nginx-proxy-companion
1
0
Fork 0
mirror of https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion synced 2024-11-26 08:53:52 +01:00
Code Issues Releases Activity

tests: fix docker compose use

Browse Source
This commit is contained in:
Nicolas Duchon 2024-08-27 07:25:34 +02:00
parent ec01ac8fc5
commit 81a7830948
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/setup/pebble/docker-compose.yml
View File

@ -1,5 +1,3 @@
version: "3"
services:
pebble:
image: "ghcr.io/letsencrypt/pebble:${PEBBLE_VERSION}"

4
test/setup/pebble/setup-pebble.sh
View File

@ -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() {
@ -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
test/setup/setup-boulder.sh
View File

@ -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 \

4
test/setup/setup-local.sh
View File

@ -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