mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-21 04:53:14 -06:00
Rip complement out of the main dockerfile
This commit is contained in:
parent
dbbbd2985d
commit
a2f7de6f0e
32
Dockerfile
32
Dockerfile
|
|
@ -22,8 +22,6 @@ RUN --mount=target=. \
|
||||||
GOOS="linux" \
|
GOOS="linux" \
|
||||||
CGO_ENABLED=$([ "$TARGETARCH" = "$USERARCH" ] && echo "1" || echo "0") \
|
CGO_ENABLED=$([ "$TARGETARCH" = "$USERARCH" ] && echo "1" || echo "0") \
|
||||||
go build -v -ldflags="${FLAGS}" -trimpath -o /out/ ./cmd/... && \
|
go build -v -ldflags="${FLAGS}" -trimpath -o /out/ ./cmd/... && \
|
||||||
go test -c -cover -covermode=atomic -o /out/dendrite-monolith-server-cover -coverpkg "github.com/matrix-org/..." ./cmd/dendrite-monolith-server && \
|
|
||||||
cp build/scripts/complement-cmd.sh /out/
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# The dendrite base image
|
# The dendrite base image
|
||||||
|
|
@ -65,33 +63,3 @@ WORKDIR /etc/dendrite
|
||||||
ENTRYPOINT ["/usr/bin/dendrite-monolith-server"]
|
ENTRYPOINT ["/usr/bin/dendrite-monolith-server"]
|
||||||
EXPOSE 8008 8448
|
EXPOSE 8008 8448
|
||||||
|
|
||||||
#
|
|
||||||
# Builds the Complement image, used for integration tests
|
|
||||||
#
|
|
||||||
FROM base AS complement
|
|
||||||
LABEL org.opencontainers.image.title="Dendrite (Complement)"
|
|
||||||
RUN apk add --no-cache sqlite openssl ca-certificates
|
|
||||||
|
|
||||||
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
|
|
||||||
COPY --from=build /out/dendrite-monolith-server-cover /usr/bin/dendrite-monolith-server-cover
|
|
||||||
COPY --from=build /out/complement-cmd.sh /complement-cmd.sh
|
|
||||||
|
|
||||||
WORKDIR /dendrite
|
|
||||||
RUN /usr/bin/generate-keys --private-key matrix_key.pem && \
|
|
||||||
mkdir /ca && \
|
|
||||||
openssl genrsa -out /ca/ca.key 2048 && \
|
|
||||||
openssl req -new -x509 -key /ca/ca.key -days 3650 -subj "/C=GB/ST=London/O=matrix.org/CN=Complement CA" -out /ca/ca.crt
|
|
||||||
|
|
||||||
ENV SERVER_NAME=localhost
|
|
||||||
ENV API=0
|
|
||||||
ENV COVER=0
|
|
||||||
EXPOSE 8008 8448
|
|
||||||
|
|
||||||
# At runtime, generate TLS cert based on the CA now mounted at /ca
|
|
||||||
# At runtime, replace the SERVER_NAME with what we are told
|
|
||||||
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 && \
|
|
||||||
exec /complement-cmd.sh
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue