diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67f5e86fd808d0bf0961d1520d7bc2fceaa2cdc9..f0adca53a588ceb23d1df547fd0dbf028752183a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,17 +16,13 @@ test: alias: memcache - name: docker.io/library/mysql:latest alias: mysql - - name: registry.git.autistici.org/pipelines/images/test/ssl-reverse-proxy:main - alias: sslproxy tags: [podman] variables: APACHE_PORT: 8080 TARGET_URL: "https://noblogs.org" - TARGET_ADDR: "sslproxy:8443" + TARGET_ADDR: "localhost:8443" MYSQL_DATABASE: noblogs MYSQL_ROOT_PASSWORD: rootpass - PROXY_DOMAIN: "noblogs.org" - PROXY_BACKEND_ADDR: "host.containers.internal:8080" before_script: - echo -n "$CI_JOB_TOKEN" | podman login -u gitlab-ci-token --password-stdin $CI_REGISTRY script: diff --git a/docker/test.sh b/docker/test.sh index dcdbde00928b3cf07af2c909103784ae0d489666..dc62403569f0f15dda6b3f054a8d11ee8ac0f2e8 100755 --- a/docker/test.sh +++ b/docker/test.sh @@ -2,6 +2,9 @@ TESTSUITE_IMAGE="registry.git.autistici.org/noblogs/testsuite:main" +# Run a ssl-reverse-proxy in the background. +podman run -d --expose 8443:8443 --rm --env PROXY_DOMAIN=noblogs.org --env PROXY_BACKEND_ADDR=localhost:8080 --network=host registry.git.autistici.org/pipelines/images/test/ssl-reverse-proxy:main + # Run the test suite using Podman, in the foreground. podman run --rm --pull=always --env TARGET_URL=${TARGET_URL} --env TARGET_ADDR=${TARGET_ADDR} --network=host ${TESTSUITE_IMAGE} rc=$?