aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@alpinelinux.org>2019-05-02 23:05:57 +0000
committerCarlo Landmeter <clandmeter@alpinelinux.org>2019-05-02 23:05:57 +0000
commitdcdb1ecc48b7d163270ffaf61b8ff276c1d63ec4 (patch)
tree682c7031b62219755310c9947c3daaa7aac4fbb2
parenta2b5085e818fff537bdb1df1f6a9c66e6031a190 (diff)
downloadalpine-drone-ci-dcdb1ecc48b7d163270ffaf61b8ff276c1d63ec4.tar.bz2
alpine-drone-ci-dcdb1ecc48b7d163270ffaf61b8ff276c1d63ec4.tar.xz
use offical arm32v7 images
-rw-r--r--dockerfiles/edge/armv7/Dockerfile5
-rw-r--r--dockerfiles/v3.9/armv7/Dockerfile5
2 files changed, 2 insertions, 8 deletions
diff --git a/dockerfiles/edge/armv7/Dockerfile b/dockerfiles/edge/armv7/Dockerfile
index ca1887d..7e9faaf 100644
--- a/dockerfiles/edge/armv7/Dockerfile
+++ b/dockerfiles/edge/armv7/Dockerfile
@@ -1,10 +1,7 @@
-FROM arm32v6/alpine:latest
+FROM arm32v7/alpine:latest
COPY overlay/ /
-# hack to force system to upgrade to armv7
-COPY dockerfiles/edge/armv7/arch /etc/apk/
-
RUN ["setup.sh", "edge" ]
USER buildozer
diff --git a/dockerfiles/v3.9/armv7/Dockerfile b/dockerfiles/v3.9/armv7/Dockerfile
index dfef6a5..a66f154 100644
--- a/dockerfiles/v3.9/armv7/Dockerfile
+++ b/dockerfiles/v3.9/armv7/Dockerfile
@@ -1,10 +1,7 @@
-FROM arm32v6/alpine:3.9
+FROM arm32v7/alpine:3.9
COPY overlay/ /
-# hack to force system to upgrade to armv7
-COPY dockerfiles/v3.9/armv7/arch /etc/apk/
-
RUN ["setup.sh", "v3.9" ]
USER buildozer