github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3665 from deitch/alpine-fix-targetauth

Browse Source 
correctly use target-arch
This commit is contained in:
Avi Deitcher 2021-05-10 15:32:20 +03:00 committed by GitHub
commit 8dd089ae93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/alpine/Dockerfile
View File

@ -106,6 +106,6 @@ COPY --from=mirror /iucode_tool /usr/bin/
RUN apk update && apk upgrade -a 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 ENV GOPATH=/go PATH=$PATH:/go/bin

2
tools/alpine/Makefile
View File

@ -24,7 +24,7 @@ iid: Dockerfile Makefile $(DEPS)
docker build --no-cache --iidfile iid . docker build --no-cache --iidfile iid .
hash: Makefile 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 versions.$(ARCH): Makefile hash iid
echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH) echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH)