Merge pull request #2208 from tonistiigi/dockerfile-version

dockerfile: fix git version detection
moby · Jun 29, 2021 · bb6f11c · bb6f11c
2 parents f4fcba5 + dc86c52
commit bb6f11c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile b/frontend/dockerfile/cmd/dockerfile-frontend/Dockerfile
@@ -4,6 +4,7 @@
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:golang@sha256:810dc54d5144f133a218e88e319184bf8b9ce01d37d46ddb37573e90decd9eef AS xx
 
 FROM --platform=$BUILDPLATFORM golang:1.16-alpine AS base
+RUN apk add git bash
 COPY --from=xx / /
 WORKDIR /src
 ENV GOFLAGS=-mod=vendor
@@ -12,9 +13,9 @@ FROM base AS version
 ARG CHANNEL
 # TODO: PKG should be inferred from go modules
 RUN --mount=target=. \ 
-  PKG=github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend VERSION=$(./frontend/dockerfile/cmd/dockerfile-frontend/hack/detect "$CHANNEL") REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \
-  echo "-X main.Version=${VERSION} -X main.Revision=${REVISION} -X main.Package=${PKG}" | tee /tmp/.ldflags; \
-  echo -n "${VERSION}" | tee /tmp/.version;
+  PKG=github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend VERSION=$(./frontend/dockerfile/cmd/dockerfile-frontend/hack/detect "$CHANNEL") REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) \
+  && echo "-X main.Version=${VERSION} -X main.Revision=${REVISION} -X main.Package=${PKG}" | tee /tmp/.ldflags \
+  && echo -n "${VERSION}" | tee /tmp/.version
 
 FROM base AS build
 RUN apk add --no-cache file