From 4c8c53244ef3448a63714a24a5d86a3ace4e7189 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 15 Feb 2022 16:27:22 +0000 Subject: [PATCH 1/2] Update prometheus --- go.mod | 6 +----- go.sum | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8cfedd7bb..11f5b0608 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/MFAshby/stdemuxerhook v1.0.0 github.com/Masterminds/semver/v3 v3.1.1 - github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/codeclysm/extract v2.2.0+incompatible github.com/containerd/containerd v1.5.9 // indirect github.com/docker/docker v20.10.12+incompatible @@ -23,7 +22,6 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/h2non/filetype v1.1.3 // indirect github.com/hashicorp/golang-lru v0.5.4 - github.com/json-iterator/go v1.1.12 // indirect github.com/juju/testing v0.0.0-20211215003918-77eb13d6cad2 // indirect github.com/klauspost/compress v1.14.2 // indirect github.com/lib/pq v1.10.4 @@ -55,9 +53,7 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/pressly/goose v2.7.0+incompatible - github.com/prometheus/client_golang v1.11.0 - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_golang v1.12.1 github.com/sirupsen/logrus v1.8.1 github.com/tidwall/gjson v1.14.0 github.com/tidwall/sjson v1.2.4 diff --git a/go.sum b/go.sum index e6678e51a..8732d27ec 100644 --- a/go.sum +++ b/go.sum @@ -1231,8 +1231,9 @@ github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDf github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1734,6 +1735,7 @@ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220207234003-57398862261d h1:Bm7BNOQt2Qv7ZqysjeLjgCBanX+88Z/OtdvsrEv1Djc= golang.org/x/sys v0.0.0-20220207234003-57398862261d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= From f92b048fec29b711ebb853193fac9977af8d5a90 Mon Sep 17 00:00:00 2001 From: kegsay Date: Tue, 15 Feb 2022 17:40:48 +0000 Subject: [PATCH 2/2] Add host mount compatible Complement image (#2187) --- build/scripts/ComplementLocal.Dockerfile | 53 ++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 build/scripts/ComplementLocal.Dockerfile diff --git a/build/scripts/ComplementLocal.Dockerfile b/build/scripts/ComplementLocal.Dockerfile new file mode 100644 index 000000000..60b4d983a --- /dev/null +++ b/build/scripts/ComplementLocal.Dockerfile @@ -0,0 +1,53 @@ +# A local development Complement dockerfile, to be used with host mounts +# /cache -> Contains the entire dendrite code at Dockerfile build time. Builds binaries but only keeps the generate-* ones. Pre-compilation saves time. +# /dendrite -> Host-mounted sources +# /runtime -> Binaries and config go here and are run at runtime +# At runtime, dendrite is built from /dendrite and run in /runtime. +# +# Use these mounts to make use of this dockerfile: +# COMPLEMENT_HOST_MOUNTS='/your/local/dendrite:/dendrite:ro;/your/go/path:/go:ro' +FROM golang:1.16-stretch +RUN apt-get update && apt-get install -y sqlite3 + +WORKDIR /runtime + +ENV SERVER_NAME=localhost +EXPOSE 8008 8448 + +# This script compiles Dendrite for us. +RUN echo '\ +#!/bin/bash -eux \n\ +if test -f "/runtime/dendrite-monolith-server"; then \n\ + echo "Skipping compilation; binaries exist" \n\ + exit 0 \n\ +fi \n\ +cd /dendrite \n\ +go build -v -o /runtime /dendrite/cmd/dendrite-monolith-server \n\ +' > compile.sh && chmod +x compile.sh + +# This script runs Dendrite for us. Must be run in the /runtime directory. +RUN echo '\ +#!/bin/bash -eu \n\ +./generate-keys --private-key matrix_key.pem \n\ +./generate-keys --server $SERVER_NAME --tls-cert server.crt --tls-key server.key --tls-authority-cert /complement/ca/ca.crt --tls-authority-key /complement/ca/ca.key \n\ +./generate-config -server $SERVER_NAME --ci > dendrite.yaml \n\ +cp /complement/ca/ca.crt /usr/local/share/ca-certificates/ && update-ca-certificates \n\ +./dendrite-monolith-server --tls-cert server.crt --tls-key server.key --config dendrite.yaml \n\ +' > run.sh && chmod +x run.sh + + +WORKDIR /cache +# Pre-download deps; we don't need to do this if the GOPATH is mounted. +COPY go.mod . +COPY go.sum . +RUN go mod download + +# Build the monolith in /cache - we won't actually use this but will rely on build artifacts to speed +# up the real compilation. Build the generate-* binaries in the true /runtime locations. +# If the generate-* source is changed, this dockerfile needs re-running. +COPY . . +RUN go build ./cmd/dendrite-monolith-server && go build -o /runtime ./cmd/generate-keys && go build -o /runtime ./cmd/generate-config + + +WORKDIR /runtime +CMD /runtime/compile.sh && /runtime/run.sh