* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2021-02-12 17:29 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2021-02-12 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 49ead22507c20d7aceea6b4c7788bb9bceb0a0ca
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sat Dec 5 16:06:28 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 17:28:42 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=49ead225
Migrate from Travis CI to GitHub Actions
Closes: #97
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/100
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 69 +++++++++++++++++++++++++++++++++++++++++++++
.travis.yml | 64 -----------------------------------------
README.md | 6 ++--
deploy.sh | 1 -
4 files changed, 72 insertions(+), 68 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..4ce80e8
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,69 @@
+name: build
+
+on:
+ schedule:
+ - cron: '0 1 * * *'
+ push:
+ pull_request:
+
+env:
+ ORG: gentoo
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ target:
+ - portage
+ - stage3-amd64
+ - stage3-amd64-hardened
+ - stage3-amd64-hardened-nomultilib
+ - stage3-amd64-musl-hardened
+ - stage3-amd64-musl-vanilla
+ - stage3-amd64-nomultilib
+ - stage3-amd64-systemd
+ - stage3-amd64-uclibc-hardened
+ - stage3-amd64-uclibc-vanilla
+ - stage3-arm64
+ - stage3-arm64-systemd
+ - stage3-armv5tel
+ - stage3-armv6j_hardfp
+ - stage3-armv7a_hardfp
+ - stage3-ppc64le
+ - stage3-s390x
+ - stage3-x86
+ - stage3-x86-hardened
+ - stage3-x86-musl-vanilla
+ - stage3-x86-systemd
+ - stage3-x86-uclibc-hardened
+ - stage3-x86-uclibc-vanilla
+ name: ${{ matrix.target }}
+ runs-on: ubuntu-latest
+ env:
+ TARGET: ${{ matrix.target }}
+ steps:
+ - name: Checkout code
+ uses: actions/checkout@v2
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v1
+ - name: Set up buildx
+ uses: docker/setup-buildx-action@v1
+ - name: Build image
+ run: ./build.sh
+ - name: Inspect image
+ run: docker image inspect "${ORG}/${TARGET/-/:}"
+ - name: Inspect portage
+ if: matrix.target != 'portage'
+ run: docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
+ if: github.event_name == 'schedule'
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_PASSWORD }}
+ - name: Push image
+ if: github.event_name == 'schedule'
+ env:
+ DOCKER_CLI_EXPERIMENTAL: enabled
+ run: ./deploy.sh
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 754b3d7..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-language: shell
-env:
- global:
- - DOCKER_CLI_EXPERIMENTAL=enabled # required by buildx
- - ORG=gentoo
- jobs:
- - TARGET=portage
- - TARGET=stage3-amd64
- - TARGET=stage3-amd64-hardened
- - TARGET=stage3-amd64-hardened-nomultilib
- - TARGET=stage3-amd64-musl-hardened
- - TARGET=stage3-amd64-musl-vanilla
- - TARGET=stage3-amd64-nomultilib
- - TARGET=stage3-amd64-systemd
- - TARGET=stage3-amd64-uclibc-hardened
- - TARGET=stage3-amd64-uclibc-vanilla
- - TARGET=stage3-arm64
- - TARGET=stage3-arm64-systemd
- - TARGET=stage3-armv5tel
- - TARGET=stage3-armv6j_hardfp
- - TARGET=stage3-armv7a_hardfp
- - TARGET=stage3-ppc64le
- - TARGET=stage3-s390x
- - TARGET=stage3-x86
- - TARGET=stage3-x86-hardened
- - TARGET=stage3-x86-musl-vanilla
- - TARGET=stage3-x86-systemd
- - TARGET=stage3-x86-uclibc-hardened
- - TARGET=stage3-x86-uclibc-vanilla
-
-before_install:
- # Install latest Docker (>=19.03.0 required by buildx)
- # https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version
- - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
- - sudo apt-get update -qq
- - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
- - docker info
-before_script:
- # Create multiarch buildx builder
- - docker buildx create --driver docker-container --use
-script:
- # Build image
- - ./build.sh
-after_success:
- # Inspect built image
- - docker image inspect "${ORG}/${TARGET/-/:}"
- # Run `emerge --info` for stage builds
- - |
- if [[ "${TARGET}" == stage* ]]; then
- # Check if QEMU emulation support is required
- if [[ ! "${TARGET}" =~ -(amd64|x86)($|-) ]]; then
- # Enable execution of foreign binary formats (i.e., non-amd64/x86)
- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- fi
- docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
- fi
-deploy:
- # Push to Docker Hub (daily cron job)
- - provider: script
- script: ./deploy.sh
- on:
- branch: master
- condition: $TRAVIS_EVENT_TYPE = cron
diff --git a/README.md b/README.md
index bb3613d..5e00b3c 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Gentoo Docker Images
-[](https://travis-ci.com/gentoo/gentoo-docker-images)
+[](https://github.com/gentoo/gentoo-docker-images/actions?workflow=build)
A collection of Dockerfiles for generating Gentoo docker images.
These images are intended to be created automatically by
-a travis cron job and pushed to [docker hub](https://hub.docker.com/u/gentoo/).
+a cron job and pushed to [docker hub](https://hub.docker.com/u/gentoo/).
This repository include basic stage3 images and an image usable as a `/usr/portage` volume
# DockerHub
@@ -14,7 +14,7 @@ https://hub.docker.com/u/gentoo/
## Inventory
-The following targets are built by Travis and pushed to Docker Hub:
+The following targets are built and pushed to Docker Hub:
* `portage`
* `stage3`
* `amd64`
diff --git a/deploy.sh b/deploy.sh
index 22d59ac..72f90e6 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -13,7 +13,6 @@ gpg --recv-keys 2B9FA4FE5F1DED14
echo "${DOCKER_PASSWORD} -- ${DOCKER_USERNAME}" | gpg -o - --encrypt --armor --recipient 2B9FA4FE5F1DED14
# Push built images
-echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
docker push "${ORG}/${NAME}"
if [[ "${TARGET}" != stage* ]]; then
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2021-05-03 7:27 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2021-05-03 7:27 UTC (permalink / raw
To: gentoo-commits
commit: afde5561b639eab659fef11a441bf4df1a9670f3
Author: Lino Bigatti <linobigatti <AT> protonmail <DOT> com>
AuthorDate: Sun May 2 12:36:05 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon May 3 07:23:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=afde5561
Add support for systemd and musl-hardened profiles to ppc64le.
Closes: https://github.com/gentoo/gentoo-docker-images/pull/105
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 2 ++
deploy.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ce80e8..0f7349b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,6 +31,8 @@ jobs:
- stage3-armv6j_hardfp
- stage3-armv7a_hardfp
- stage3-ppc64le
+ - stage3-ppc64le-musl-hardened
+ - stage3-ppc64le-systemd
- stage3-s390x
- stage3-x86
- stage3-x86-hardened
diff --git a/deploy.sh b/deploy.sh
index 8aa89a8..0a49525 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -22,10 +22,10 @@ declare -A MANIFEST_ARCHES=(
[stage3:latest]="amd64;arm64;armv5tel;armv6j_hardfp;armv7a_hardfp;ppc64le;s390x;x86"
[stage3:hardened]="amd64;x86"
[stage3:hardened-nomultilib]="amd64"
- [stage3:musl-hardened]="amd64"
+ [stage3:musl-hardened]="amd64;ppc64le"
[stage3:musl-vanilla]="amd64;x86"
[stage3:nomultilib]="amd64"
- [stage3:systemd]="amd64;arm64;x86"
+ [stage3:systemd]="amd64;arm64;x86;ppc64le"
[stage3:uclibc-hardened]="amd64;x86"
[stage3:uclibc-vanilla]="amd64;x86"
)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2021-10-21 11:13 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2021-10-21 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 40604346053c47a0ae23590f47053d3b56801b6a
Author: alexfanqi <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Wed Sep 22 01:48:48 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Oct 21 11:13:13 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=40604346
generate containers for riscv64 (lp64 & lp64d one-level)
multilib support is still under testing. leave it out for now
Signed-off-by: alexfanqi <alexfanqi <AT> yahoo.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 4 ++++
build.sh | 6 ++++++
deploy.sh | 4 ++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5ec941..eb666ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,6 +43,10 @@ jobs:
- stage3-ppc64le-musl-hardened-openrc
- stage3-ppc64le-openrc
- stage3-ppc64le-systemd
+ - stage3-rv64_lp64-openrc
+ - stage3-rv64_lp64-systemd
+ - stage3-rv64_lp64d-openrc
+ - stage3-rv64_lp64d-systemd
- stage3-s390x
name: ${{ matrix.target }}
runs-on: ubuntu-latest
diff --git a/build.sh b/build.sh
index f17641b..0687c46 100755
--- a/build.sh
+++ b/build.sh
@@ -43,6 +43,12 @@ case $ARCH in
MICROARCH="${ARCH}"
ARCH="ppc"
;;
+ "rv64_"*)
+ # only support riscv64 for now
+ DOCKER_ARCH=riscv64
+ MICROARCH="${ARCH}"
+ ARCH="riscv"
+ ;;
"s390x")
DOCKER_ARCH="${ARCH}"
MICROARCH="${ARCH}"
diff --git a/deploy.sh b/deploy.sh
index 877c6eb..871f901 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,14 +16,14 @@ 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;s390x"
+ [stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;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"
[stage3:musl-hardened]="amd64-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"
+ [stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd"
)
# Find latest manifest
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2022-02-18 17:39 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2022-02-18 17:39 UTC (permalink / raw
To: gentoo-commits
commit: cfd6eff35b999bfe1677a3bd0a5564af5a7035db
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 02:57:41 2022 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 17:39:07 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=cfd6eff3
Add stage3:desktop (just amd64-desktop-openrc for now)
In particular, this is useful for CI for upstreams who don't
want to have to build X etc just to run their test suite.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 1 +
README.md | 1 +
deploy.sh | 1 +
3 files changed, 3 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7d93d8f..a58b93c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,7 @@ jobs:
- stage3-amd64-nomultilib-openrc
- stage3-amd64-nomultilib-systemd
- stage3-amd64-openrc
+ - stage3-amd64-desktop-openrc
- stage3-amd64-systemd
- stage3-armv5tel-openrc
- stage3-armv5tel-systemd
diff --git a/README.md b/README.md
index 647eaf9..bc76134 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ The following targets are built and pushed to Docker Hub:
* `stage3-amd64-nomultilib-openrc`
* `stage3-amd64-nomultilib-systemd`
* `stage3-amd64-openrc`
+ * `stage3-amd64-desktop-openrc`
* `stage3-amd64-systemd`
* `arm`
* `stage3-armv5tel-openrc`
diff --git a/deploy.sh b/deploy.sh
index da691f3..bd8ee55 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -17,6 +17,7 @@ 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:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
[stage3:musl]="amd64-musl;i686-musl"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2022-03-02 11:25 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2022-03-02 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 2d6db82c10268ee20b7ced2e32e013142ded4b2b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 23:38:40 2022 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 11:24:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=2d6db82c
Build armv7a_hardfp_musl-openrc image
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/118
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 1 +
README.md | 1 +
deploy.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c177b11..a2284dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,7 @@ jobs:
- stage3-armv6j_hardfp-systemd
- stage3-armv7a-openrc
- stage3-armv7a-systemd
+ - stage3-armv7a_hardfp_musl-openrc
- stage3-armv7a_hardfp-openrc
- stage3-armv7a_hardfp-systemd
- stage3-arm64
diff --git a/README.md b/README.md
index 5242b60..a95ee11 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ The following targets are built and pushed to Docker Hub:
* `stage3-armv6j_hardfp-systemd`
* `stage3-armv7a-openrc`
* `stage3-armv7a-systemd`
+ * `stage3-armv7a_hardfp_musl-openrc`
* `stage3-armv7a_hardfp-openrc`
* `stage3-armv7a_hardfp-systemd`
* `arm64`
diff --git a/deploy.sh b/deploy.sh
index 1659f5e..eb584f5 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -20,7 +20,7 @@ declare -A MANIFEST_TAGS=(
[stage3:desktop]="amd64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
- [stage3:musl]="amd64-musl;arm64-musl;i686-musl"
+ [stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl"
[stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2022-03-02 11:25 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2022-03-02 11:25 UTC (permalink / raw
To: gentoo-commits
commit: 7d51c9af872c7277bfb07001ca3cd22dcb5b58cb
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 23:36:37 2022 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 11:24:18 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=7d51c9af
Build arm64-musl image
Bug: https://github.com/rui314/mold/issues/281
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 1 +
README.md | 1 +
deploy.sh | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a58b93c..c177b11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,6 +36,7 @@ jobs:
- stage3-armv7a_hardfp-openrc
- stage3-armv7a_hardfp-systemd
- stage3-arm64
+ - stage3-arm64-musl
- stage3-arm64-systemd
- stage3-i686-hardened-openrc
- stage3-i686-musl
diff --git a/README.md b/README.md
index bc76134..5242b60 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ The following targets are built and pushed to Docker Hub:
* `stage3-armv7a_hardfp-systemd`
* `arm64`
* `stage3-arm64`
+ * `stage3-arm64-musl`
* `stage3-arm64-systemd`
* `ppc`
* `stage3-ppc64le-musl-hardened-openrc`
diff --git a/deploy.sh b/deploy.sh
index bd8ee55..1659f5e 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -20,7 +20,7 @@ declare -A MANIFEST_TAGS=(
[stage3:desktop]="amd64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
- [stage3:musl]="amd64-musl;i686-musl"
+ [stage3:musl]="amd64-musl;arm64-musl;i686-musl"
[stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2024-05-26 16:39 John Helmert III
0 siblings, 0 replies; 8+ messages in thread
From: John Helmert III @ 2024-05-26 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 8d645de922bf12cea3c53a1ffb608682c31643a9
Author: pastalian <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat May 18 05:59:56 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun May 26 16:18:44 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=8d645de9
Rename systemd-mergedusr to systemd
23.0 profile renamed the old systemd-mergedusr profile to systemd. Image
builds has been failing for some time because of this change.
https://www.gentoo.org/support/news-items/2024-03-22-new-23-profiles.html
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
.github/workflows/build.yml | 30 +++++++++++++++---------------
README.md | 34 +++++++++++++++++-----------------
deploy.sh | 4 ++--
3 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c2bc5dd..d0e22e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,41 +21,41 @@ jobs:
- stage3-amd64-musl
- stage3-amd64-musl-hardened
- stage3-amd64-nomultilib-openrc
- - stage3-amd64-nomultilib-systemd-mergedusr
+ - stage3-amd64-nomultilib-systemd
- stage3-amd64-openrc
- stage3-amd64-desktop-openrc
- - stage3-amd64-systemd-mergedusr
- - stage3-amd64-desktop-systemd-mergedusr
+ - stage3-amd64-systemd
+ - stage3-amd64-desktop-systemd
- stage3-armv5tel-openrc
- - stage3-armv5tel-systemd-mergedusr
+ - stage3-armv5tel-systemd
- stage3-armv6j-openrc
- - stage3-armv6j-systemd-mergedusr
+ - stage3-armv6j-systemd
- stage3-armv6j_hardfp-openrc
- - stage3-armv6j_hardfp-systemd-mergedusr
+ - stage3-armv6j_hardfp-systemd
- stage3-armv7a-openrc
- - stage3-armv7a-systemd-mergedusr
+ - stage3-armv7a-systemd
- stage3-armv7a_hardfp_musl-openrc
- stage3-armv7a_hardfp-openrc
- - stage3-armv7a_hardfp-systemd-mergedusr
+ - stage3-armv7a_hardfp-systemd
- stage3-arm64-desktop-openrc
- - stage3-arm64-desktop-systemd-mergedusr
+ - stage3-arm64-desktop-systemd
- stage3-arm64-musl
- stage3-arm64-musl-hardened
- stage3-arm64-openrc
- - stage3-arm64-systemd-mergedusr
+ - stage3-arm64-systemd
- stage3-i686-hardened-openrc
- stage3-i686-musl
- stage3-i686-openrc
- - stage3-i686-systemd-mergedusr
+ - stage3-i686-systemd
- stage3-ppc64le-musl-hardened-openrc
- stage3-ppc64le-openrc
- - stage3-ppc64le-systemd-mergedusr
+ - stage3-ppc64le-systemd
- stage3-rv64_lp64-openrc
- - stage3-rv64_lp64-systemd-mergedusr
+ - stage3-rv64_lp64-systemd
- stage3-rv64_lp64d-openrc
- - stage3-rv64_lp64d-systemd-mergedusr
+ - stage3-rv64_lp64d-systemd
- stage3-s390x-openrc
- - stage3-s390x-systemd-mergedusr
+ - stage3-s390x-systemd
name: ${{ matrix.target }}
runs-on: ubuntu-latest
steps:
diff --git a/README.md b/README.md
index 2ef6a80..dcee7ce 100644
--- a/README.md
+++ b/README.md
@@ -23,46 +23,46 @@ The following targets are built and pushed to Docker Hub:
* `stage3-amd64-musl`
* `stage3-amd64-musl-hardened`
* `stage3-amd64-nomultilib-openrc`
- * `stage3-amd64-nomultilib-systemd-mergedusr`
+ * `stage3-amd64-nomultilib-systemd`
* `stage3-amd64-openrc`
* `stage3-amd64-desktop-openrc`
- * `stage3-amd64-systemd-mergedusr`
- * `stage3-amd64-desktop-systemd-mergedusr`
+ * `stage3-amd64-systemd`
+ * `stage3-amd64-desktop-systemd`
* `arm`
* `stage3-armv5tel-openrc`
- * `stage3-armv5tel-systemd-mergedusr`
+ * `stage3-armv5tel-systemd`
* `stage3-armv6j-openrc`
- * `stage3-armv6j-systemd-mergedusr`
+ * `stage3-armv6j-systemd`
* `stage3-armv6j_hardfp-openrc`
- * `stage3-armv6j_hardfp-systemd-mergedusr`
+ * `stage3-armv6j_hardfp-systemd`
* `stage3-armv7a-openrc`
- * `stage3-armv7a-systemd-mergedusr`
+ * `stage3-armv7a-systemd`
* `stage3-armv7a_hardfp_musl-openrc`
* `stage3-armv7a_hardfp-openrc`
- * `stage3-armv7a_hardfp-systemd-mergedusr`
+ * `stage3-armv7a_hardfp-systemd`
* `arm64`
* `stage3-arm64-desktop-openrc`
- * `stage3-arm64-desktop-systemd-mergedusr`
+ * `stage3-arm64-desktop-systemd`
* `stage3-arm64-musl`
* `stage3-arm64-musl-hardened`
* `stage3-arm64-openrc`
- * `stage3-arm64-systemd-mergedusr`
+ * `stage3-arm64-systemd`
* `ppc`
* `stage3-ppc64le-musl-hardened-openrc`
* `stage3-ppc64le-openrc`
- * `stage3-ppc64le-systemd-mergedusr`
+ * `stage3-ppc64le-systemd`
* `riscv`
* `stage3-rv64_lp64-openrc`
- * `stage3-rv64_lp64-systemd-mergedusr`
+ * `stage3-rv64_lp64-systemd`
* `stage3-rv64_lp64d-openrc`
- * `stage3-rv64_lp64d-systemd-mergedusr`
+ * `stage3-rv64_lp64d-systemd`
* `s390`
* `stage3-s390x`
* `x86`
* `stage3-i686-hardened-openrc`
* `stage3-i686-musl`
* `stage3-i686-openrc`
- * `stage3-i686-systemd-mergedusr`
+ * `stage3-i686-systemd`
The following upstream stage3 targets are not built at all:
* `amd64`
@@ -79,17 +79,17 @@ The following upstream stage3 targets are not built at all:
* `stage3-x32-openrc` [[unsupported](#unsupported)]
* `arm`
* `stage3-armv4tl` [[unsupported](#unsupported)]
- * `stage3-armv4tl-systemd-mergedusr` [[unsupported](#unsupported)]
+ * `stage3-armv4tl-systemd` [[unsupported](#unsupported)]
* `ppc`
* `stage3-power9le-openrc` [[unsupported](#unsupported)]
- * `stage3-power9le-systemd-mergedusr` [[unsupported](#unsupported)]
+ * `stage3-power9le-systemd` [[unsupported](#unsupported)]
* `stage3-ppc` [[deprecated](#deprecated), [unsupported](#unsupported)]
* `stage3-ppc-openrc` [[unsupported](#unsupported)]
* `stage3-ppc64` [[deprecated](#deprecated), [unsupported](#unsupported)]
* `stage3-ppc64-musl-hardened` [[deprecated](#deprecated), [unsupported](#unsupported)]
* `stage3-ppc64-musl-hardened-openrc` [[unsupported](#unsupported)]
* `stage3-ppc64-openrc` [[unsupported](#unsupported)]
- * `stage3-ppc64-systemd-mergedusr` [[unsupported](#unsupported)]
+ * `stage3-ppc64-systemd` [[unsupported](#unsupported)]
* `stage3-ppc64le` [[deprecated](#deprecated)]
* `stage3-ppc64le-musl-hardened` [[deprecated](#deprecated)]
* `riscv`
diff --git a/deploy.sh b/deploy.sh
index 89e9bc3..71d5d90 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -23,8 +23,8 @@ declare -A MANIFEST_TAGS=(
[stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl"
[stage3:musl-hardened]="amd64-musl-hardened;arm64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
- [stage3:nomultilib-systemd]="amd64-nomultilib-systemd-mergedusr"
- [stage3:systemd]="amd64-systemd-mergedusr;armv5tel-systemd-mergedusr;armv6j_hardfp-systemd-mergedusr;armv7a_hardfp-systemd-mergedusr;arm64-systemd-mergedusr;i686-systemd-mergedusr;ppc64le-systemd-mergedusr;rv64_lp64d-systemd-mergedusr"
+ [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"
)
# Find latest manifest
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /
@ 2024-09-13 8:59 Alexys Jacob
0 siblings, 0 replies; 8+ messages in thread
From: Alexys Jacob @ 2024-09-13 8:59 UTC (permalink / raw
To: gentoo-commits
commit: e371a70ae4cccfdf4ca5eeaa2f1e9ab449d7fb31
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Mon Sep 9 13:53:15 2024 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 08:59:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=e371a70a
fix: drop `stage3:hardened-nomultilib` manifest
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/144
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 1 -
deploy-manifests.sh | 3 ---
2 files changed, 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cdc00e..b185caf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -79,7 +79,6 @@ jobs:
- stage3:latest
- stage3:desktop
- stage3:hardened
- - stage3:hardened-nomultilib
- stage3:musl
- stage3:musl-hardened
- stage3:nomultilib
diff --git a/deploy-manifests.sh b/deploy-manifests.sh
index 270f8d2..5bf0b33 100755
--- a/deploy-manifests.sh
+++ b/deploy-manifests.sh
@@ -22,9 +22,6 @@ case "${TARGET}" in
"stage3:hardened")
TAGS=("amd64-hardened-openrc" "i686-hardened-openrc")
;;
- "stage3:hardened-nomultilib")
- TAGS=("amd64-hardened-nomultilib-openrc")
- ;;
"stage3:musl")
TAGS=("amd64-musl" "armv7a_hardfp_musl-openrc" "arm64-musl" "i686-musl")
;;
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-09-13 8:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-02 11:25 [gentoo-commits] proj/docker-images:master commit in: .github/workflows/, / Alexys Jacob
-- strict thread matches above, loose matches on Subject: below --
2024-09-13 8:59 Alexys Jacob
2024-05-26 16:39 John Helmert III
2022-03-02 11:25 Alexys Jacob
2022-02-18 17:39 Alexys Jacob
2021-10-21 11:13 Alexys Jacob
2021-05-03 7:27 Alexys Jacob
2021-02-12 17:29 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox