From 1fcbb9b5e5b7791c50be437c20d73d973b2b78ee Mon Sep 17 00:00:00 2001 From: 0x1a8510f2 Date: Thu, 3 Nov 2022 08:37:58 +0000 Subject: [PATCH] Fix workdir in Dockerfile (and make it a volume) (#2852) --- Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 007d985b6..e09cc2bea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,6 @@ LABEL org.opencontainers.image.documentation="https://matrix-org.github.io/dendr LABEL org.opencontainers.image.vendor="The Matrix.org Foundation C.I.C." RUN addgroup dendrite && adduser dendrite -G dendrite -u 1337 -D USER dendrite -WORKDIR /home/dendrite # # Builds the polylith image and only contains the polylith binary @@ -43,6 +42,9 @@ LABEL org.opencontainers.image.title="Dendrite (Polylith)" COPY --from=build /out/dendrite-polylith-multi /usr/bin/ +VOLUME /etc/dendrite +WORKDIR /etc/dendrite + ENTRYPOINT ["/usr/bin/dendrite-polylith-multi"] # @@ -56,6 +58,9 @@ COPY --from=build /out/generate-config /usr/bin/generate-config COPY --from=build /out/generate-keys /usr/bin/generate-keys COPY --from=build /out/dendrite-monolith-server /usr/bin/dendrite-monolith-server +VOLUME /etc/dendrite +WORKDIR /etc/dendrite + ENTRYPOINT ["/usr/bin/dendrite-monolith-server"] EXPOSE 8008 8448 @@ -119,4 +124,4 @@ EXPOSE 8008 8448 CMD /usr/bin/generate-keys --server $SERVER_NAME --tls-cert server.crt --tls-key server.key --tls-authority-cert /ca/ca.crt --tls-authority-key /ca/ca.key && \ /usr/bin/generate-config -server $SERVER_NAME --ci > dendrite.yaml && \ cp /ca/ca.crt /usr/local/share/ca-certificates/ && update-ca-certificates && \ - /usr/bin/dendrite-monolith-server --really-enable-open-registration --tls-cert server.crt --tls-key server.key --config dendrite.yaml -api=${API:-0} \ No newline at end of file + /usr/bin/dendrite-monolith-server --really-enable-open-registration --tls-cert server.crt --tls-key server.key --config dendrite.yaml -api=${API:-0}