From 8f98fe0add2a2bd94ea801962ffeb9f8c5ce23d7 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 23 Mar 2019 21:07:58 -0700 Subject: [PATCH] Switching to new Base images, shift to arm32v7 tag. --- Dockerfile.aarch64 | 7 ++----- Dockerfile.armhf | 7 ++----- README.md | 3 ++- readme-vars.yml | 3 ++- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 395a94d..1a084af 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.arm64:3.9 as buildstage +FROM lsiobase/alpine:arm64v8-3.9 as buildstage ############## build stage ############## # package version @@ -86,10 +86,7 @@ RUN \ >> /tmp/znc/packages ############## runtime stage ############## -FROM lsiobase/alpine.arm64:3.9 - -# Add qemu to build on x86_64 systems -COPY qemu-aarch64-static /usr/bin +FROM lsiobase/alpine:arm64v8-3.9 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 75c200e..96c9e57 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/alpine.armhf:3.9 as buildstage +FROM lsiobase/alpine:arm32v7-3.9 as buildstage ############## build stage ############## # package version @@ -86,10 +86,7 @@ RUN \ >> /tmp/znc/packages ############## runtime stage ############## -FROM lsiobase/alpine.armhf:3.9 - -# Add qemu to build on x86_64 systems -COPY qemu-arm-static /usr/bin +FROM lsiobase/alpine:arm32v7-3.9 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index 5f4c86b..e6ce46b 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ The architectures supported by this image are: | :----: | --- | | x86-64 | amd64-latest | | arm64 | arm64v8-latest | -| armhf | arm32v6-latest | +| armhf | arm32v7-latest | ## Usage @@ -160,6 +160,7 @@ Below are the instructions for updating containers: ## Versions +* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **22.02.19:** - Rebasing to alpine 3.9. * **31.01.19:** - Add pipeline logic and multi arch. * **30.01.19:** - Add push and clientbuffer modules. diff --git a/readme-vars.yml b/readme-vars.yml index 3cd97ba..2e0e33f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -12,7 +12,7 @@ project_blurb_optional_extras_enabled: false available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - - { arch: "{{ arch_armhf }}", tag: "arm32v6-latest"} + - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} # development version development_versions: false @@ -52,6 +52,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." } - { date: "31.01.19:", desc: "Add pipeline logic and multi arch." } - { date: "30.01.19:", desc: "Add push and clientbuffer modules." }