diff --git a/build/docker/Dockerfile.monolith b/build/docker/Dockerfile.monolith index 0745f696e..3180e9626 100644 --- a/build/docker/Dockerfile.monolith +++ b/build/docker/Dockerfile.monolith @@ -7,7 +7,7 @@ WORKDIR /build COPY . /build RUN mkdir -p bin -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/dendrite-monolith-server RUN go build -trimpath -o bin/ ./cmd/create-account RUN go build -trimpath -o bin/ ./cmd/generate-keys diff --git a/clientapi/routing/routing.go b/clientapi/routing/routing.go index fa4793417..81e16b1bc 100644 --- a/clientapi/routing/routing.go +++ b/clientapi/routing/routing.go @@ -41,9 +41,6 @@ import ( "github.com/sirupsen/logrus" ) -// 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. // @@ -104,7 +101,7 @@ func Setup( JSON: struct { Versions []string `json:"versions"` UnstableFeatures map[string]bool `json:"unstable_features"` - CommitHash string `json:"commit_hash"` + BuildVersion string `json:"build_version"` }{Versions: []string{ "r0.0.1", "r0.1.0", @@ -116,7 +113,7 @@ func Setup( "v1.0", "v1.1", "v1.2", - }, UnstableFeatures: unstableFeatures, CommitHash: CommitHash}, + }, UnstableFeatures: unstableFeatures, BuildVersion: "TODO"}, } }), ).Methods(http.MethodGet, http.MethodOptions)