Skip to content

Commit 6dbcf9e

Browse files
authored
Merge pull request #6037 from aciba90/2007-use-commit-date-in-binary-artifacts
Use commit date in release binary artifacts
2 parents 5f16f79 + be3e6a9 commit 6dbcf9e

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ RUN --mount=target=. <<'EOT'
6969
exit 1
7070
}
7171
set -ex
72-
export PKG=github.com/moby/buildkit VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi);
72+
export PKG=github.com/moby/buildkit VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi) COMMIT_DATE=$(git show -s --format=%cI HEAD);
7373
echo "-X ${PKG}/version.Version=${VERSION} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" > /tmp/.ldflags;
7474
echo -n "${VERSION}" > /tmp/.version;
75+
echo -n "${COMMIT_DATE}" > /tmp/.commit_date;
7576
EOT
7677

7778
# buildctl builds test cli binary
@@ -195,7 +196,8 @@ WORKDIR /work
195196
ARG TARGETPLATFORM
196197
RUN --mount=from=binaries \
197198
--mount=source=/tmp/.version,target=/tmp/.version,from=buildkit-version \
198-
mkdir -p /out && tar czvf "/out/buildkit-$(cat /tmp/.version).$(echo $TARGETPLATFORM | sed 's/\//-/g').tar.gz" --mtime='2015-10-21 00:00Z' --sort=name --transform 's/^./bin/' .
199+
--mount=source=/tmp/.commit_date,target=/tmp/.commit_date,from=buildkit-version \
200+
mkdir -p /out && tar czvf "/out/buildkit-$(cat /tmp/.version).$(echo $TARGETPLATFORM | sed 's/\//-/g').tar.gz" --mtime="$(cat /tmp/.commit_date)" --sort=name --transform 's/^./bin/' .
199201

200202
FROM scratch AS release
201203
COPY --link --from=releaser /out/ /

0 commit comments

Comments
 (0)