| 1 |
commit: 72f09f90c16350954c623b5f6e3c403dea847ce1 |
| 2 |
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Nov 22 19:27:45 2021 +0000 |
| 4 |
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 1 11:31:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=72f09f90 |
| 7 |
|
| 8 |
Fix armv*-openrc stage3 builds |
| 9 |
|
| 10 |
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo-docker-images/pull/112 |
| 12 |
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org> |
| 13 |
|
| 14 |
.github/workflows/build.yml | 10 +++++----- |
| 15 |
README.md | 10 +++++----- |
| 16 |
deploy.sh | 2 +- |
| 17 |
3 files changed, 11 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml |
| 20 |
index eb666ee..7d93d8f 100644 |
| 21 |
--- a/.github/workflows/build.yml |
| 22 |
+++ b/.github/workflows/build.yml |
| 23 |
@@ -24,15 +24,15 @@ jobs: |
| 24 |
- stage3-amd64-nomultilib-systemd |
| 25 |
- stage3-amd64-openrc |
| 26 |
- stage3-amd64-systemd |
| 27 |
- - stage3-armv5tel |
| 28 |
+ - stage3-armv5tel-openrc |
| 29 |
- stage3-armv5tel-systemd |
| 30 |
- - stage3-armv6j |
| 31 |
+ - stage3-armv6j-openrc |
| 32 |
- stage3-armv6j-systemd |
| 33 |
- - stage3-armv6j_hardfp |
| 34 |
+ - stage3-armv6j_hardfp-openrc |
| 35 |
- stage3-armv6j_hardfp-systemd |
| 36 |
- - stage3-armv7a |
| 37 |
+ - stage3-armv7a-openrc |
| 38 |
- stage3-armv7a-systemd |
| 39 |
- - stage3-armv7a_hardfp |
| 40 |
+ - stage3-armv7a_hardfp-openrc |
| 41 |
- stage3-armv7a_hardfp-systemd |
| 42 |
- stage3-arm64 |
| 43 |
- stage3-arm64-systemd |
| 44 |
|
| 45 |
diff --git a/README.md b/README.md |
| 46 |
index a103766..647eaf9 100644 |
| 47 |
--- a/README.md |
| 48 |
+++ b/README.md |
| 49 |
@@ -27,15 +27,15 @@ The following targets are built and pushed to Docker Hub: |
| 50 |
* `stage3-amd64-openrc` |
| 51 |
* `stage3-amd64-systemd` |
| 52 |
* `arm` |
| 53 |
- * `stage3-armv5tel` |
| 54 |
+ * `stage3-armv5tel-openrc` |
| 55 |
* `stage3-armv5tel-systemd` |
| 56 |
- * `stage3-armv6j` |
| 57 |
+ * `stage3-armv6j-openrc` |
| 58 |
* `stage3-armv6j-systemd` |
| 59 |
- * `stage3-armv6j_hardfp` |
| 60 |
+ * `stage3-armv6j_hardfp-openrc` |
| 61 |
* `stage3-armv6j_hardfp-systemd` |
| 62 |
- * `stage3-armv7a` |
| 63 |
+ * `stage3-armv7a-openrc` |
| 64 |
* `stage3-armv7a-systemd` |
| 65 |
- * `stage3-armv7a_hardfp` |
| 66 |
+ * `stage3-armv7a_hardfp-openrc` |
| 67 |
* `stage3-armv7a_hardfp-systemd` |
| 68 |
* `arm64` |
| 69 |
* `stage3-arm64` |
| 70 |
|
| 71 |
diff --git a/deploy.sh b/deploy.sh |
| 72 |
index 871f901..da691f3 100755 |
| 73 |
--- a/deploy.sh |
| 74 |
+++ b/deploy.sh |
| 75 |
@@ -16,7 +16,7 @@ ORG=${ORG:-gentoo} |
| 76 |
docker push --all-tags "${ORG}/${NAME}" |
| 77 |
|
| 78 |
declare -A MANIFEST_TAGS=( |
| 79 |
- [stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x" |
| 80 |
+ [stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x" |
| 81 |
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc" |
| 82 |
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc" |
| 83 |
[stage3:musl]="amd64-musl;i686-musl" |
Archives