From 4d9de9a583c74fcddcb8c815266b58d646c4e5df Mon Sep 17 00:00:00 2001 From: Avi Deitcher Date: Mon, 10 May 2021 12:21:33 +0300 Subject: [PATCH] correctly use target-arch Signed-off-by: Avi Deitcher --- tools/alpine/Dockerfile | 2 +- tools/alpine/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile index 9fc8f593c..620bd2cce 100644 --- a/tools/alpine/Dockerfile +++ b/tools/alpine/Dockerfile @@ -106,6 +106,6 @@ COPY --from=mirror /iucode_tool /usr/bin/ RUN apk update && apk upgrade -a -RUN echo Dockerfile /lib/apk/db/installed $(find /mirror -name '*.apk' -type f) $(find /go/bin -type f) | xargs cat | sha1sum | sed 's/ .*//' | sed 's/$/-${TARGETARCH}/' > /etc/alpine-hash +RUN echo Dockerfile /lib/apk/db/installed $(find /mirror -name '*.apk' -type f) $(find /go/bin -type f) | xargs cat | sha1sum | sed 's/ .*//' | sed 's/$/-'"${TARGETARCH}"'/' > /etc/alpine-hash-arch ENV GOPATH=/go PATH=$PATH:/go/bin diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile index b78b4d65d..d3416d3cf 100644 --- a/tools/alpine/Makefile +++ b/tools/alpine/Makefile @@ -24,7 +24,7 @@ iid: Dockerfile Makefile $(DEPS) docker build --no-cache --iidfile iid . hash: Makefile iid - docker run --rm $(shell cat iid) cat /etc/alpine-hash > $@ + docker run --rm $(shell cat iid) cat /etc/alpine-hash-arch > $@ versions.$(ARCH): Makefile hash iid echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH)