aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantinos Smanis <konstantinos.smanis@gmail.com>2022-03-20 15:34:18 +0200
committerAlexys Jacob <ultrabug@gentoo.org>2022-04-12 08:04:02 +0000
commit4f7db8bb687e27d46c22560bc881c85fbf614220 (patch)
tree6efffbe828830be2f1032e1ce0773e0404a96169
parentBuild armv7a_hardfp_musl-openrc image (diff)
downloaddocker-images-4f7db8bb687e27d46c22560bc881c85fbf614220.tar.gz
docker-images-4f7db8bb687e27d46c22560bc881c85fbf614220.tar.bz2
docker-images-4f7db8bb687e27d46c22560bc881c85fbf614220.zip
Fix arm64 stage3 builds
Signed-off-by: Konstantinos Smanis <konstantinos.smanis@gmail.com> Closes: https://github.com/gentoo/gentoo-docker-images/pull/119 Signed-off-by: Alexys Jacob <ultrabug@gentoo.org>
-rw-r--r--.github/workflows/build.yml5
-rw-r--r--README.md5
-rwxr-xr-xdeploy.sh6
3 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2284dd..1fb11d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,8 +36,11 @@ jobs:
- stage3-armv7a_hardfp_musl-openrc
- stage3-armv7a_hardfp-openrc
- stage3-armv7a_hardfp-systemd
- - stage3-arm64
+ - stage3-arm64-desktop-openrc
+ - stage3-arm64-desktop-systemd
- stage3-arm64-musl
+ - stage3-arm64-musl-hardened
+ - stage3-arm64-openrc
- stage3-arm64-systemd
- stage3-i686-hardened-openrc
- stage3-i686-musl
diff --git a/README.md b/README.md
index a95ee11..ebbb88d 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,11 @@ The following targets are built and pushed to Docker Hub:
* `stage3-armv7a_hardfp-openrc`
* `stage3-armv7a_hardfp-systemd`
* `arm64`
- * `stage3-arm64`
+ * `stage3-arm64-desktop-openrc`
+ * `stage3-arm64-desktop-systemd`
* `stage3-arm64-musl`
+ * `stage3-arm64-musl-hardened`
+ * `stage3-arm64-openrc`
* `stage3-arm64-systemd`
* `ppc`
* `stage3-ppc64le-musl-hardened-openrc`
diff --git a/deploy.sh b/deploy.sh
index eb584f5..71d5d90 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,12 +16,12 @@ ORG=${ORG:-gentoo}
docker push --all-tags "${ORG}/${NAME}"
declare -A MANIFEST_TAGS=(
- [stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
- [stage3:desktop]="amd64-desktop-openrc"
+ [stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64-openrc;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
+ [stage3:desktop]="amd64-desktop-openrc;arm64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
[stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl"
- [stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
+ [stage3:musl-hardened]="amd64-musl-hardened;arm64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"
[stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd"