serv/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2024-12-27 04:53:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Caddy integration for reverse-proxy

Browse source
This commit is contained in:
Rudi Floren 2020-09-17 21:11:18 +02:00
parent 7c456a0390
commit 009e36b680
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/Complement.Dockerfile
View file

@ -1,5 +1,5 @@
FROM valkum/docker-rust-ci:latest as builder FROM valkum/docker-rust-ci:latest as builder
WORKDIR /build WORKDIR /workdir
ARG RUSTC_WRAPPER ARG RUSTC_WRAPPER
ARG AWS_ACCESS_KEY_ID ARG AWS_ACCESS_KEY_ID
@ -12,17 +12,19 @@ COPY . .
RUN cargo build RUN cargo build
FROM valkum/docker-rust-ci:latest 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 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 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
COPY Rocket-example.toml Rocket.toml
ENV SERVER_NAME=localhost 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/server_name = \"your.server.name\"/server_name = \"${SERVER_NAME}\"/g" Rocket.toml
RUN sed -i "s/port = 14004/port: 8008/g" Rocket.toml RUN sed -i "s/port = 14004/port = 8008/g" Rocket.toml
EXPOSE 8008 8448 EXPOSE 8008 8448
CMD caddy --from 8448 --to localhost:8008 & && /conduit CMD /workdir/caddy reverse-proxy --from ${SERVER_NAME}:8448 --to localhost:8008 > /dev/null 2>&1 & /workdir/conduit