From 412857be9646b28999b7970633ca572e31260a51 Mon Sep 17 00:00:00 2001
From: Alan Raison <alanraison@users.noreply.github.com>
Date: Tue, 26 Jun 2018 23:15:19 +0100
Subject: [PATCH] Use apk --print-arch to discover architecture

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>
---
 tools/alpine/Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/alpine/Dockerfile b/tools/alpine/Dockerfile
index 7b695e395..f1ad7598f 100644
--- a/tools/alpine/Dockerfile
+++ b/tools/alpine/Dockerfile
@@ -9,8 +9,8 @@ COPY packages* /tmp/
 
 # mirror packages
 RUN cat /tmp/packages.$(uname -m) >> /tmp/packages && \
-   mkdir -p /mirror/$(uname -m) && \
-   apk fetch --recursive -o /mirror/$(uname -m) $(apk info; cat /tmp/packages)
+   mkdir -p /mirror/$(apk --print-arch) && \
+   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.
 # 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 && \
     curl -fsSLo APKBUILD https://git.alpinelinux.org/cgit/aports/plain/testing/wireguard-tools/APKBUILD && \
     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
 RUN apk add --no-cache abuild
@@ -32,11 +32,11 @@ RUN apk add --no-cache abuild
 RUN abuild-keygen -a -i -n
 
 # 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
-RUN cp /mirror/$(uname -m)/APKINDEX.unsigned.tar.gz /mirror/$(uname -m)/APKINDEX.tar.gz
-RUN abuild-sign /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/$(apk --print-arch)/APKINDEX.tar.gz
 
 # 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