commit:     72f09f90c16350954c623b5f6e3c403dea847ce1
Author:     Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Mon Nov 22 19:27:45 2021 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 11:31:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=72f09f90

Fix armv*-openrc stage3 builds

Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/112
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>

 .github/workflows/build.yml | 10 +++++-----
 README.md                   | 10 +++++-----
 deploy.sh                   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eb666ee..7d93d8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,15 +24,15 @@ jobs:
           - stage3-amd64-nomultilib-systemd
           - stage3-amd64-openrc
           - stage3-amd64-systemd
-          - stage3-armv5tel
+          - stage3-armv5tel-openrc
           - stage3-armv5tel-systemd
-          - stage3-armv6j
+          - stage3-armv6j-openrc
           - stage3-armv6j-systemd
-          - stage3-armv6j_hardfp
+          - stage3-armv6j_hardfp-openrc
           - stage3-armv6j_hardfp-systemd
-          - stage3-armv7a
+          - stage3-armv7a-openrc
           - stage3-armv7a-systemd
-          - stage3-armv7a_hardfp
+          - stage3-armv7a_hardfp-openrc
           - stage3-armv7a_hardfp-systemd
           - stage3-arm64
           - stage3-arm64-systemd

diff --git a/README.md b/README.md
index a103766..647eaf9 100644
--- a/README.md
+++ b/README.md
@@ -27,15 +27,15 @@ The following targets are built and pushed to Docker Hub:
      * `stage3-amd64-openrc`
      * `stage3-amd64-systemd`
    * `arm`
-     * `stage3-armv5tel`
+     * `stage3-armv5tel-openrc`
      * `stage3-armv5tel-systemd`
-     * `stage3-armv6j`
+     * `stage3-armv6j-openrc`
      * `stage3-armv6j-systemd`
-     * `stage3-armv6j_hardfp`
+     * `stage3-armv6j_hardfp-openrc`
      * `stage3-armv6j_hardfp-systemd`
-     * `stage3-armv7a`
+     * `stage3-armv7a-openrc`
      * `stage3-armv7a-systemd`
-     * `stage3-armv7a_hardfp`
+     * `stage3-armv7a_hardfp-openrc`
      * `stage3-armv7a_hardfp-systemd`
    * `arm64`
      * `stage3-arm64`

diff --git a/deploy.sh b/deploy.sh
index 871f901..da691f3 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,7 +16,7 @@ ORG=${ORG:-gentoo}
 docker push --all-tags "${ORG}/${NAME}"
 
 declare -A MANIFEST_TAGS=(
-       
[stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
+       
[stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
        [stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
        [stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
        [stage3:musl]="amd64-musl;i686-musl"

Reply via email to