mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-11 16:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f681e54bef745cb6d769615d56e2c36cca552955'

Browse source
This commit is contained in:
Brian Meek 2022-09-15 15:01:00 -07:00
parent 55341ef3cf f681e54bef
commit 62306576f0
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/docker/Dockerfile.monolith
View file

@ -1,4 +1,4 @@
FROM docker.io/golang:1.18-alpine AS base
FROM docker.io/golang:1.19-alpine AS base
RUN apk --update --no-cache add bash build-base
@ -7,7 +7,7 @@ WORKDIR /build
COPY . /build
RUN mkdir -p bin
RUN go build -trimpath -o bin/ ./cmd/dendrite-monolith-server
RUN go build -ldflags="-X 'routing.CommitHash=`git rev-list -1 HEAD`'" -trimpath -o bin/ ./cmd/dendrite-monolith-server
RUN go build -trimpath -o bin/ ./cmd/create-account
RUN go build -trimpath -o bin/ ./cmd/generate-keys

16
clientapi/routing/routing.go
View file

@ -19,8 +19,6 @@ import (
"net/http"
"strings"
"runtime/debug"
"github.com/gorilla/mux"
appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
"github.com/matrix-org/dendrite/clientapi/api"
@ -43,16 +41,8 @@ import (
"github.com/sirupsen/logrus"
)
var commitHash = func() string {
if info, ok := debug.ReadBuildInfo(); ok {
for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
return setting.Value
}
}
}
return ""
}()
// Added in build script Cokerfile.monolith
var CommitHash string
// Setup registers HTTP handlers with the given ServeMux. It also supplies the given http.Client
// to clients which need to make outbound HTTP requests.
@ -126,7 +116,7 @@ func Setup(
"v1.0",
"v1.1",
"v1.2",
}, UnstableFeatures: unstableFeatures, CommitHash: commitHash},
}, UnstableFeatures: unstableFeatures, CommitHash: CommitHash},
}
}),
).Methods(http.MethodGet, http.MethodOptions)