diff options
| author | kegsay <kegan@matrix.org> | 2022-02-01 16:36:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 16:36:17 +0000 |
| commit | a09d71d231861f8825a4f8f1dfd79311c4c236a6 (patch) | |
| tree | 23768a595cc4972ec63ddf74c66a2605fac61e74 /build/scripts | |
| parent | 9ada4578e36b367c53057c9ee32d044e2ba26395 (diff) | |
Support CA certificates in CI (#2136)
* Support CA setting in generate-keys
* Set DNS names correctly
* Use generate-config -server not sed
Diffstat (limited to 'build/scripts')
| -rw-r--r-- | build/scripts/Complement.Dockerfile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/scripts/Complement.Dockerfile b/build/scripts/Complement.Dockerfile index 55b381ba..401695ab 100644 --- a/build/scripts/Complement.Dockerfile +++ b/build/scripts/Complement.Dockerfile @@ -12,10 +12,14 @@ COPY . . RUN go build ./cmd/dendrite-monolith-server RUN go build ./cmd/generate-keys RUN go build ./cmd/generate-config -RUN ./generate-config --ci > dendrite.yaml -RUN ./generate-keys --private-key matrix_key.pem --tls-cert server.crt --tls-key server.key +RUN ./generate-keys --private-key matrix_key.pem ENV SERVER_NAME=localhost EXPOSE 8008 8448 -CMD sed -i "s/server_name: localhost/server_name: ${SERVER_NAME}/g" dendrite.yaml && ./dendrite-monolith-server --tls-cert server.crt --tls-key server.key --config dendrite.yaml +# 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 ./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 && \ + ./generate-config -server $SERVER_NAME --ci > dendrite.yaml && \ + cp /ca/ca.crt /usr/local/share/ca-certificates/ && update-ca-certificates && \ + ./dendrite-monolith-server --tls-cert server.crt --tls-key server.key --config dendrite.yaml |