summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/Complement.Dockerfile16
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/Complement.Dockerfile b/tests/Complement.Dockerfile
index 10a33d7..f32f878 100644
--- a/tests/Complement.Dockerfile
+++ b/tests/Complement.Dockerfile
@@ -1,5 +1,5 @@
FROM valkum/docker-rust-ci:latest as builder
-WORKDIR /build
+WORKDIR /workdir
ARG RUSTC_WRAPPER
ARG AWS_ACCESS_KEY_ID
@@ -12,17 +12,19 @@ COPY . .
RUN cargo build
FROM valkum/docker-rust-ci:latest
-WORKDIR /build
+WORKDIR /workdir
RUN curl -OL "https://github.com/caddyserver/caddy/releases/download/v2.1.1/caddy_2.1.1_linux_amd64.tar.gz"
RUN tar xzf caddy_2.1.1_linux_amd64.tar.gz
-COPY --from=builder /build/target/debug/conduit /conduit
+COPY --from=builder /workdir/target/debug/conduit /workdir/conduit
-ENV SERVER_NAME=localhost
COPY Rocket-example.toml Rocket.toml
-RUN sed -i "s/server_name: your.server.name/server_name: ${SERVER_NAME}/g" Rocket.toml
-RUN sed -i "s/port = 14004/port: 8008/g" Rocket.toml
+
+ENV SERVER_NAME=localhost
+
+RUN sed -i "s/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml
+RUN sed -i "s/port = 14004/port = 8008/g" Rocket.toml
EXPOSE 8008 8448
-CMD caddy --from 8448 --to localhost:8008 & && /conduit \ No newline at end of file
+CMD /workdir/caddy reverse-proxy --from ${SERVER_NAME}:8448 --to localhost:8008 > /dev/null 2>&1 & /workdir/conduit \ No newline at end of file