github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Use apk --print-arch to discover architecture

Browse Source 
When dealing with apk, `uname -m` doesn't always match the architecture
name that apk uses. Instead `apk --print-arch` is used.

Signed-off-by: Alan Raison <alanraison@users.noreply.github.com>
This commit is contained in:
Alan Raison 2018-06-26 23:15:19 +01:00
parent ef47cd9c98
commit 412857be96
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/alpine/Dockerfile
View File

@ -9,8 +9,8 @@ COPY packages* /tmp/
# mirror packages # mirror packages
RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \ RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \
mkdir -p /mirror/$(uname -m) && \ mkdir -p /mirror/$(apk --print-arch) && \
apk fetch --recursive -o /mirror/$(uname -m) $(apk info; cat /tmp/packages) apk fetch --recursive -o /mirror/$(apk --print-arch) $(apk info; cat /tmp/packages)
# It's tricky to mix edge/testing packages which sometimes leads to dependency conflicts. # It's tricky to mix edge/testing packages which sometimes leads to dependency conflicts.
# wireguard-tools currently is only in edge, so here we build our own package using the # wireguard-tools currently is only in edge, so here we build our own package using the
@ -23,7 +23,7 @@ RUN apk add alpine-sdk libmnl-dev curl && \
cd /wireguard && \ cd /wireguard && \
curl -fsSLo APKBUILD https://git.alpinelinux.org/cgit/aports/plain/testing/wireguard-tools/APKBUILD && \ curl -fsSLo APKBUILD https://git.alpinelinux.org/cgit/aports/plain/testing/wireguard-tools/APKBUILD && \
su -c "abuild-keygen -a -n && abuild -r" builder && \ su -c "abuild-keygen -a -n && abuild -r" builder && \
cp /home/builder/packages/$(uname -m)/wireguard-tools-[0-9]*.apk /mirror/$(uname -m) cp /home/builder/packages/$(apk --print-arch)/wireguard-tools-[0-9]*.apk /mirror/$(apk --print-arch)
# install abuild for signing # install abuild for signing
RUN apk add --no-cache abuild RUN apk add --no-cache abuild
@ -32,11 +32,11 @@ RUN apk add --no-cache abuild
RUN abuild-keygen -a -i -n RUN abuild-keygen -a -i -n
# index the new repo # index the new repo
RUN apk index --rewrite-arch $(uname -m) -o /mirror/$(uname -m)/APKINDEX.unsigned.tar.gz /mirror/$(uname -m)/*.apk RUN apk index --rewrite-arch $(apk --print-arch) -o /mirror/$(apk --print-arch)/APKINDEX.unsigned.tar.gz /mirror/$(apk --print-arch)/*.apk
# sign the index # sign the index
RUN cp /mirror/$(uname -m)/APKINDEX.unsigned.tar.gz /mirror/$(uname -m)/APKINDEX.tar.gz RUN cp /mirror/$(apk --print-arch)/APKINDEX.unsigned.tar.gz /mirror/$(apk --print-arch)/APKINDEX.tar.gz
RUN abuild-sign /mirror/$(uname -m)/APKINDEX.tar.gz RUN abuild-sign /mirror/$(apk --print-arch)/APKINDEX.tar.gz
# set this as our repo but keep a copy of the upstream for downstream use # set this as our repo but keep a copy of the upstream for downstream use
RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > /etc/apk/repositories && apk update RUN mv /etc/apk/repositories /etc/apk/repositories.upstream && echo "/mirror" > /etc/apk/repositories && apk update