From e4c5ed96a9612b0e10a42bb108cf2ae58a776d3a Mon Sep 17 00:00:00 2001 From: Rudi Floren Date: Mon, 9 Nov 2020 17:21:35 +0100 Subject: [PATCH] Sync with newest complement changes --- tests/Complement.Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Complement.Dockerfile b/tests/Complement.Dockerfile index f3cbd99c..21c3105a 100644 --- a/tests/Complement.Dockerfile +++ b/tests/Complement.Dockerfile @@ -32,7 +32,9 @@ RUN echo '{"apps":{"http":{"https_port":8448,"servers":{"srv0":{"listen":[":8448 EXPOSE 8008 8448 -CMD sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml && \ +CMD ([ -z "${COMPLEMENT_CA}" ] && echo "Error: Need Complement CA support" && true) || \ + sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml && \ sed -i "s/your.server.name/${SERVER_NAME}/g" caddy.json && \ /workdir/caddy start --config caddy.json > /dev/null && \ - /workdir/conduit \ No newline at end of file + /workdir/conduit + \ No newline at end of file