From 1a7413ecabc922953fc3dcd08a634f3b136bce2e Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 19 Jan 2025 11:02:47 +0000
Subject: [PATCH] Fix --expose
---
.gitlab-ci.yml | 2 +-
docker/test.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0adca53..3ff188fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,5 +30,5 @@ test:
- git clone --depth=1 https://gitlab-ci-token:${CI_JOB_TOKEN}@git.autistici.org/ai3/testdata.git /tmp/testdata.$CI_JOB_ID
- xzcat /tmp/testdata.$CI_JOB_ID/noblogs/noblogs.sql.xz | mysql --user=root --password=rootpass --host=mysql noblogs
- for blog in cavallette detriti docs ; do xzcat /tmp/testdata.$CI_JOB_ID/noblogs/noblogs_${blog}.sql.xz | mysql --user=root --password=rootpass --host=mysql noblogs; done
- - with-container --expose=8080:8080 --mount=type=bind,source=docker/test-config.json,destination=/etc/noblogs/config.json --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/blogs.dir --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/cache $IMAGE_TAG ./docker/test.sh
+ - with-container --expose=8080 --mount=type=bind,source=docker/test-config.json,destination=/etc/noblogs/config.json --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/blogs.dir --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/cache $IMAGE_TAG ./docker/test.sh
diff --git a/docker/test.sh b/docker/test.sh
index dc624035..9201c786 100755
--- a/docker/test.sh
+++ b/docker/test.sh
@@ -3,7 +3,7 @@
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
+podman run -d --expose 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}
--
GitLab