* [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/
@ 2021-08-20 18:05 Alexys Jacob
0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2021-08-20 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 7d477af788c1b206bd22d1268ed75e842d3fe00e
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Wed Aug 4 20:35:41 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 18:05:13 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=7d477af7
Update stage3 targets
Closes: #109
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/108
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 38 ++++++++++--------
README.md | 94 +++++++++++++++++++++++++++++++--------------
build.sh | 16 +++-----
deploy.sh | 71 +++++++++++++++++++---------------
4 files changed, 131 insertions(+), 88 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0f7349b..a5ec941 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,30 +16,34 @@ jobs:
matrix:
target:
- portage
- - stage3-amd64
- - stage3-amd64-hardened
- - stage3-amd64-hardened-nomultilib
+ - stage3-amd64-hardened-nomultilib-openrc
+ - stage3-amd64-hardened-openrc
+ - stage3-amd64-musl
- stage3-amd64-musl-hardened
- - stage3-amd64-musl-vanilla
- - stage3-amd64-nomultilib
+ - stage3-amd64-nomultilib-openrc
+ - stage3-amd64-nomultilib-systemd
+ - stage3-amd64-openrc
- stage3-amd64-systemd
- - stage3-amd64-uclibc-hardened
- - stage3-amd64-uclibc-vanilla
- - stage3-arm64
- - stage3-arm64-systemd
- stage3-armv5tel
+ - stage3-armv5tel-systemd
+ - stage3-armv6j
+ - stage3-armv6j-systemd
- stage3-armv6j_hardfp
+ - stage3-armv6j_hardfp-systemd
+ - stage3-armv7a
+ - stage3-armv7a-systemd
- stage3-armv7a_hardfp
- - stage3-ppc64le
- - stage3-ppc64le-musl-hardened
+ - stage3-armv7a_hardfp-systemd
+ - stage3-arm64
+ - stage3-arm64-systemd
+ - stage3-i686-hardened-openrc
+ - stage3-i686-musl
+ - stage3-i686-openrc
+ - stage3-i686-systemd
+ - stage3-ppc64le-musl-hardened-openrc
+ - stage3-ppc64le-openrc
- stage3-ppc64le-systemd
- 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:
diff --git a/README.md b/README.md
index 651b940..b474e04 100644
--- a/README.md
+++ b/README.md
@@ -18,50 +18,86 @@ The following targets are built and pushed to Docker Hub:
* `portage`
* `stage3`
* `amd64`
- * `stage3-amd64`
- * `stage3-amd64-hardened`
- * `stage3-amd64-hardened-nomultilib`
+ * `stage3-amd64-hardened-nomultilib-openrc`
+ * `stage3-amd64-hardened-openrc`
+ * `stage3-amd64-musl`
* `stage3-amd64-musl-hardened`
- * `stage3-amd64-musl-vanilla`
- * `stage3-amd64-nomultilib`
+ * `stage3-amd64-nomultilib-openrc`
+ * `stage3-amd64-nomultilib-systemd`
+ * `stage3-amd64-openrc`
* `stage3-amd64-systemd`
- * `stage3-amd64-uclibc-hardened`
- * `stage3-amd64-uclibc-vanilla`
- * `arm64`
- * `stage3-arm64`
- * `stage3-arm64-systemd`
* `arm`
* `stage3-armv5tel`
+ * `stage3-armv5tel-systemd`
+ * `stage3-armv6j`
+ * `stage3-armv6j-systemd`
* `stage3-armv6j_hardfp`
+ * `stage3-armv6j_hardfp-systemd`
+ * `stage3-armv7a`
+ * `stage3-armv7a-systemd`
* `stage3-armv7a_hardfp`
+ * `stage3-armv7a_hardfp-systemd`
+ * `arm64`
+ * `stage3-arm64`
+ * `stage3-arm64-systemd`
* `ppc`
- * `stage3-ppc64le`
+ * `stage3-ppc64le-musl-hardened-openrc`
+ * `stage3-ppc64le-openrc`
+ * `stage3-ppc64le-systemd`
* `s390`
* `stage3-s390x`
* `x86`
- * `stage3-x86`
- * `stage3-x86-hardened`
- * `stage3-x86-musl-vanilla`
- * `stage3-x86-systemd`
- * `stage3-x86-uclibc-hardened`
- * `stage3-x86-uclibc-vanilla`
-
-The following upstream stage3 targets are not built at all (see [rationale](https://github.com/gentoo/gentoo-docker-images/issues/75#issuecomment-680776939)):
+ * `stage3-i686-hardened-openrc`
+ * `stage3-i686-musl`
+ * `stage3-i686-openrc`
+ * `stage3-i686-systemd`
+
+The following upstream stage3 targets are not built at all:
* `amd64`
- * `stage3-amd64-hardened-selinux`
- * `stage3-amd64-hardened-selinux+nomultilib`
- * `stage3-x32`
+ * `stage3-amd64` [[deprecated](#deprecated)]
+ * `stage3-amd64-hardened` [[deprecated](#deprecated)]
+ * `stage3-amd64-hardened+nomultilib` [[deprecated](#deprecated)]
+ * `stage3-amd64-hardened-selinux` [[deprecated](#deprecated), [selinux](#selinux)]
+ * `stage3-amd64-hardened-selinux+nomultilib` [[deprecated](#deprecated), [selinux](#selinux)]
+ * `stage3-amd64-hardened-selinux-openrc` [[selinux](#selinux)]
+ * `stage3-amd64-musl-vanilla` [[deprecated](#deprecated)]
+ * `stage3-amd64-nomultilib` [[deprecated](#deprecated)]
+ * `stage3-amd64-nomultilib-selinux-openrc` [[selinux](#selinux)]
+ * `stage3-amd64-uclibc-hardened` [[deprecated](#deprecated)]
+ * `stage3-amd64-uclibc-vanilla` [[deprecated](#deprecated)]
+ * `stage3-x32` [[deprecated](#deprecated), [unsupported](#unsupported)]
+ * `stage3-x32-openrc` [[unsupported](#unsupported)]
* `arm`
- * `stage3-armv4tl`
- * `stage3-armv6j`
- * `stage3-armv7a`
+ * `stage3-armv4tl` [[unsupported](#unsupported)]
+ * `stage3-armv4tl-systemd` [[unsupported](#unsupported)]
* `ppc`
- * `stage3-ppc`
- * `stage3-ppc64`
+ * `stage3-power9le-openrc` [[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` [[unsupported](#unsupported)]
+ * `stage3-ppc64le` [[deprecated](#deprecated)]
+ * `stage3-ppc64le-musl-hardened` [[deprecated](#deprecated)]
* `s390`
- * `stage3-s390`
+ * `stage3-s390` [[unsupported](#unsupported)]
* `x86`
- * `stage3-i486`
+ * `stage3-i486` [[deprecated](#deprecated), [unsupported](#unsupported)]
+ * `stage3-i486-openrc` [[unsupported](#unsupported)]
+ * `stage3-i686` [[deprecated](#deprecated)]
+ * `stage3-i686-hardened` [[deprecated](#deprecated)]
+ * `stage3-i686-musl-vanilla` [[deprecated](#deprecated)]
+ * `stage3-i686-uclibc-hardened` [[deprecated](#deprecated)]
+ * `stage3-i686-uclibc-vanilla` [[deprecated](#deprecated)]
+
+<a name="deprecated">[deprecated]</a>: Deprecated stage3 target
+
+<a name="selinux">[selinux]</a>: [SELinux doesn't seem to make sense inside containers](https://serverfault.com/q/757606/)
+
+<a name="unsupported">[unsupported]</a>: [Unsupported Docker architecture](https://github.com/docker-library/official-images#architectures-other-than-amd64)
# Building the containers
diff --git a/build.sh b/build.sh
index c3979a3..f17641b 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,7 @@
# Example usage: TARGET=stage3-amd64 ./build.sh
if [[ -z "$TARGET" ]]; then
- echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64."
+ echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64-openrc."
exit 1
fi
@@ -33,6 +33,11 @@ case $ARCH in
MICROARCH="${ARCH}"
ARCH="arm"
;;
+ "i686")
+ DOCKER_ARCH="386"
+ MICROARCH="${ARCH}"
+ ARCH="x86"
+ ;;
"ppc64le")
DOCKER_ARCH="${ARCH}"
MICROARCH="${ARCH}"
@@ -43,20 +48,11 @@ case $ARCH in
MICROARCH="${ARCH}"
ARCH="s390"
;;
- "x86")
- DOCKER_ARCH="386"
- MICROARCH="i686"
- ;;
*) # portage
DOCKER_ARCH="amd64"
;;
esac
-# Handle targets with special characters in the suffix
-if [[ "${TARGET}" == "stage3-amd64-hardened-nomultilib" ]]; then
- SUFFIX="hardened+nomultilib"
-fi
-
# Prefix the suffix with a hyphen to make sure the URL works
if [[ -n "${SUFFIX}" ]]; then
SUFFIX="-${SUFFIX}"
diff --git a/deploy.sh b/deploy.sh
index 0a49525..877c6eb 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,60 +1,67 @@
#!/bin/bash
if [[ -z "$TARGET" ]]; then
- echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64."
+ echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64-openrc."
exit 1
fi
# Split the TARGET variable into three elements separated by hyphens
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
+VERSION=${VERSION:-$(date -u +%Y%m%d)}
+
+ORG=${ORG:-gentoo}
+
# Push built images
docker push --all-tags "${ORG}/${NAME}"
-if [[ "${TARGET}" != stage* ]]; then
+declare -A MANIFEST_TAGS=(
+ [stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-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"
+)
+
+# Find latest manifest
+TAG="${ARCH}${SUFFIX:+-${SUFFIX}}"
+for MANIFEST in "${!MANIFEST_TAGS[@]}"; do
+ if [[ "${MANIFEST_TAGS[${MANIFEST}]}" =~ (^|;)"${TAG}"(;|$) ]]; then
+ IFS=';' read -ra TAGS <<< "${MANIFEST_TAGS[${MANIFEST}]}"
+ break
+ fi
+done
+if [[ -z "${TAGS+x}" ]]; then
echo "Done! No manifests to push for TARGET=${TARGET}."
exit 0
fi
-VERSION=${VERSION:-$(date -u +%Y%m%d)}
-
-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;ppc64le"
- [stage3:musl-vanilla]="amd64;x86"
- [stage3:nomultilib]="amd64"
- [stage3:systemd]="amd64;arm64;x86;ppc64le"
- [stage3:uclibc-hardened]="amd64;x86"
- [stage3:uclibc-vanilla]="amd64;x86"
-)
-
# Latest manifests
-MANIFEST="${NAME}:${SUFFIX:-latest}"
-IFS=';' read -ra ARCHES <<< "${MANIFEST_ARCHES[${MANIFEST}]}"
-
-TAGS=()
-for ARCH in "${ARCHES[@]}"; do
- TAG="${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}"
- if docker manifest inspect "${TAG}" 1>/dev/null 2>&1; then
- TAGS+=("${TAG}")
+IMAGES=()
+for TAG in "${TAGS[@]}"; do
+ IMAGE="${ORG}/${NAME}:${TAG}"
+ if docker manifest inspect "${IMAGE}" &>/dev/null; then
+ IMAGES+=("${IMAGE}")
fi
done
-docker manifest create "${ORG}/${MANIFEST}" "${TAGS[@]}"
+docker manifest create "${ORG}/${MANIFEST}" "${IMAGES[@]}"
docker manifest push "${ORG}/${MANIFEST}"
# Dated manifests
-MANIFEST="${NAME}:${SUFFIX:+${SUFFIX}-}${VERSION}"
+MANIFEST="${MANIFEST}-${VERSION}"
+MANIFEST="${MANIFEST/:latest-/:}" # Remove "latest" tag prefix
-TAGS=()
-for ARCH in "${ARCHES[@]}"; do
- TAG="${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}-${VERSION}"
- if docker manifest inspect "${TAG}" 1>/dev/null 2>&1; then
- TAGS+=("${TAG}")
+IMAGES=()
+for TAG in "${TAGS[@]}"; do
+ IMAGE="${ORG}/${NAME}:${TAG}-${VERSION}"
+ if docker manifest inspect "${IMAGE}" &>/dev/null; then
+ IMAGES+=("${IMAGE}")
fi
done
-docker manifest create "${ORG}/${MANIFEST}" "${TAGS[@]}"
+docker manifest create "${ORG}/${MANIFEST}" "${IMAGES[@]}"
docker manifest push "${ORG}/${MANIFEST}"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/
@ 2021-12-01 11:31 Alexys Jacob
0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2021-12-01 11:31 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/
@ 2022-04-12 8:04 Alexys Jacob
0 siblings, 0 replies; 6+ messages in thread
From: Alexys Jacob @ 2022-04-12 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 4f7db8bb687e27d46c22560bc881c85fbf614220
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sun Mar 20 13:34:18 2022 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 08:04:02 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4f7db8bb
Fix arm64 stage3 builds
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/119
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.github/workflows/build.yml | 5 ++++-
README.md | 5 ++++-
deploy.sh | 6 +++---
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"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/
@ 2023-06-29 15:22 John Helmert III
0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2023-06-29 15:22 UTC (permalink / raw
To: gentoo-commits
commit: c98033b1dc679a5e3ded53ee52ad15e738eeb0a0
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 29 02:22:56 2023 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Jun 29 15:22:35 2023 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=c98033b1
add plumbing to produce a python testing image
Closes: #73
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/128
.github/workflows/build.yml | 5 +++++
build-python.sh | 17 +++++++++++++++++
python.Dockerfile | 16 ++++++++++++++++
3 files changed, 38 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 021efcc..ef4e56f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,7 @@ jobs:
fail-fast: false
matrix:
target:
+ - python
- portage
- stage3-amd64-hardened-nomultilib-openrc
- stage3-amd64-hardened-openrc
@@ -67,7 +68,11 @@ jobs:
- name: Set up buildx
uses: docker/setup-buildx-action@v2
- name: Build image
+ if: startswith(matrix.target, 'stage3') || startswith(matrix.target, 'portage')
run: ./build.sh
+ - name: Build python image
+ if: startswith( matrix.target, 'python')
+ run: ./build-python.sh
- name: Inspect image
run: docker image inspect "${ORG}/${TARGET/-/:}"
- name: Inspect portage
diff --git a/build-python.sh b/build-python.sh
new file mode 100755
index 0000000..6289c05
--- /dev/null
+++ b/build-python.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+NAME=python
+VERSION=${VERSION:-$(date -u +%Y%m%d)}
+VERSION_SUFFIX="-${VERSION}"
+
+ORG=${ORG:-gentoo}
+
+docker buildx build \
+ --file "${NAME}.Dockerfile" \
+ --build-arg ARCH="amd64" \
+ --build-arg MICROARCH="amd64" \
+ --tag "${ORG}/python" \
+ --platform "linux/amd64" \
+ --progress plain \
+ --load \
+ .
diff --git a/python.Dockerfile b/python.Dockerfile
new file mode 100644
index 0000000..7b61532
--- /dev/null
+++ b/python.Dockerfile
@@ -0,0 +1,16 @@
+FROM gentoo/stage3:amd64-nomultilib-openrc
+
+# derived from https://github.com/projg2/gentoo-python-image/blob/master/Dockerfile
+
+RUN echo '*/* ~amd64' >> /etc/portage/package.accept_keywords/base.conf \
+ && echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python \
+ && echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git \
+ && wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz \
+ && mv gentoo-master /var/db/repos/gentoo \
+ && emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
+ dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite \
+ && emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12} \
+ dev-python/pypy{,3_9,3_10,3} \
+ && rm -r /var/db/repos/* /var/cache/distfiles/*
+
+CMD ["/bin/bash"]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/
@ 2024-02-08 3:17 John Helmert III
0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2024-02-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 4f11bfd241fc1681b7bde2aae3e05dd21a779907
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 01:05:05 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 03:16:39 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4f11bfd2
Switch systemd images to mergedusr
In bug #917143, we stopped building non-merged-usr stage3s following the
2022-12-01-systemd-usrmerge news item a while prior, as upstream systemd
no longer support non-merged-usr.
The stages for systemd w/ non-merged-usr are no being built, so the last one
we picked up was stage3-amd64-systemd-20231210T170356Z.tar.xz (and so on).
Switch all systemd images accordingly to merged-usr.
Bug: https://bugs.gentoo.org/915958
Bug: https://bugs.gentoo.org/917143
Closes: https://github.com/gentoo/gentoo-docker-images/issues/136
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
.github/workflows/build.yml | 28 +++++++++++++---------------
README.md | 32 +++++++++++++++-----------------
deploy.sh | 4 ++--
3 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a22ace1..c2bc5dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,43 +21,41 @@ jobs:
- stage3-amd64-musl
- stage3-amd64-musl-hardened
- stage3-amd64-nomultilib-openrc
- - stage3-amd64-nomultilib-systemd
+ - stage3-amd64-nomultilib-systemd-mergedusr
- stage3-amd64-openrc
- stage3-amd64-desktop-openrc
- - stage3-amd64-systemd
- stage3-amd64-systemd-mergedusr
- - stage3-amd64-desktop-systemd
- stage3-amd64-desktop-systemd-mergedusr
- stage3-armv5tel-openrc
- - stage3-armv5tel-systemd
+ - stage3-armv5tel-systemd-mergedusr
- stage3-armv6j-openrc
- - stage3-armv6j-systemd
+ - stage3-armv6j-systemd-mergedusr
- stage3-armv6j_hardfp-openrc
- - stage3-armv6j_hardfp-systemd
+ - stage3-armv6j_hardfp-systemd-mergedusr
- stage3-armv7a-openrc
- - stage3-armv7a-systemd
+ - stage3-armv7a-systemd-mergedusr
- stage3-armv7a_hardfp_musl-openrc
- stage3-armv7a_hardfp-openrc
- - stage3-armv7a_hardfp-systemd
+ - stage3-armv7a_hardfp-systemd-mergedusr
- stage3-arm64-desktop-openrc
- - stage3-arm64-desktop-systemd
+ - stage3-arm64-desktop-systemd-mergedusr
- stage3-arm64-musl
- stage3-arm64-musl-hardened
- stage3-arm64-openrc
- - stage3-arm64-systemd
+ - stage3-arm64-systemd-mergedusr
- stage3-i686-hardened-openrc
- stage3-i686-musl
- stage3-i686-openrc
- - stage3-i686-systemd
+ - stage3-i686-systemd-mergedusr
- stage3-ppc64le-musl-hardened-openrc
- stage3-ppc64le-openrc
- - stage3-ppc64le-systemd
+ - stage3-ppc64le-systemd-mergedusr
- stage3-rv64_lp64-openrc
- - stage3-rv64_lp64-systemd
+ - stage3-rv64_lp64-systemd-mergedusr
- stage3-rv64_lp64d-openrc
- - stage3-rv64_lp64d-systemd
+ - stage3-rv64_lp64d-systemd-mergedusr
- stage3-s390x-openrc
- - stage3-s390x-systemd
+ - stage3-s390x-systemd-mergedusr
name: ${{ matrix.target }}
runs-on: ubuntu-latest
steps:
diff --git a/README.md b/README.md
index 0301c7f..998b810 100644
--- a/README.md
+++ b/README.md
@@ -23,48 +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`
+ * `stage3-amd64-nomultilib-systemd-mergedusr`
* `stage3-amd64-openrc`
* `stage3-amd64-desktop-openrc`
- * `stage3-amd64-systemd`
* `stage3-amd64-systemd-mergedusr`
- * `stage3-amd64-desktop-systemd`
* `stage3-amd64-desktop-systemd-mergedusr`
* `arm`
* `stage3-armv5tel-openrc`
- * `stage3-armv5tel-systemd`
+ * `stage3-armv5tel-systemd-mergedusr`
* `stage3-armv6j-openrc`
- * `stage3-armv6j-systemd`
+ * `stage3-armv6j-systemd-mergedusr`
* `stage3-armv6j_hardfp-openrc`
- * `stage3-armv6j_hardfp-systemd`
+ * `stage3-armv6j_hardfp-systemd-mergedusr`
* `stage3-armv7a-openrc`
- * `stage3-armv7a-systemd`
+ * `stage3-armv7a-systemd-mergedusr`
* `stage3-armv7a_hardfp_musl-openrc`
* `stage3-armv7a_hardfp-openrc`
- * `stage3-armv7a_hardfp-systemd`
+ * `stage3-armv7a_hardfp-systemd-mergedusr`
* `arm64`
* `stage3-arm64-desktop-openrc`
- * `stage3-arm64-desktop-systemd`
+ * `stage3-arm64-desktop-systemd-mergedusr`
* `stage3-arm64-musl`
* `stage3-arm64-musl-hardened`
* `stage3-arm64-openrc`
- * `stage3-arm64-systemd`
+ * `stage3-arm64-systemd-mergedusr`
* `ppc`
* `stage3-ppc64le-musl-hardened-openrc`
* `stage3-ppc64le-openrc`
- * `stage3-ppc64le-systemd`
+ * `stage3-ppc64le-systemd-mergedusr`
* `riscv`
* `stage3-rv64_lp64-openrc`
- * `stage3-rv64_lp64-systemd`
+ * `stage3-rv64_lp64-systemd-mergedusr`
* `stage3-rv64_lp64d-openrc`
- * `stage3-rv64_lp64d-systemd`
+ * `stage3-rv64_lp64d-systemd-mergedusr`
* `s390`
* `stage3-s390x`
* `x86`
* `stage3-i686-hardened-openrc`
* `stage3-i686-musl`
* `stage3-i686-openrc`
- * `stage3-i686-systemd`
+ * `stage3-i686-systemd-mergedusr`
The following upstream stage3 targets are not built at all:
* `amd64`
@@ -83,17 +81,17 @@ The following upstream stage3 targets are not built at all:
* `stage3-x32-openrc` [[unsupported](#unsupported)]
* `arm`
* `stage3-armv4tl` [[unsupported](#unsupported)]
- * `stage3-armv4tl-systemd` [[unsupported](#unsupported)]
+ * `stage3-armv4tl-systemd-mergedusr` [[unsupported](#unsupported)]
* `ppc`
* `stage3-power9le-openrc` [[unsupported](#unsupported)]
- * `stage3-power9le-systemd` [[unsupported](#unsupported)]
+ * `stage3-power9le-systemd-mergedusr` [[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` [[unsupported](#unsupported)]
+ * `stage3-ppc64-systemd-mergedusr` [[unsupported](#unsupported)]
* `stage3-ppc64le` [[deprecated](#deprecated)]
* `stage3-ppc64le-musl-hardened` [[deprecated](#deprecated)]
* `riscv`
diff --git a/deploy.sh b/deploy.sh
index 71d5d90..89e9bc3 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"
- [stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd"
+ [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"
)
# Find latest manifest
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/
@ 2024-09-21 22:12 John Helmert III
0 siblings, 0 replies; 6+ messages in thread
From: John Helmert III @ 2024-09-21 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 5bd0c53a7a39951e6c0fe4b1601c0b3165cc8230
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 18 13:15:40 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 22:11:41 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=5bd0c53a
Build llvm based images
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/146
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
.github/workflows/build.yml | 9 +++++++++
README.md | 6 ++++++
deploy-manifests.sh | 9 +++++++++
3 files changed, 24 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7491b9f..8918d2c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,11 @@ jobs:
target:
- python
- stage3-amd64-hardened-openrc
+ - stage3-amd64-llvm-openrc
+ - stage3-amd64-llvm-systemd
- stage3-amd64-musl
- stage3-amd64-musl-hardened
+ - stage3-amd64-musl-llvm
- stage3-amd64-nomultilib-openrc
- stage3-amd64-nomultilib-systemd
- stage3-amd64-openrc
@@ -39,8 +42,11 @@ jobs:
- stage3-armv7a_hardfp-systemd
- stage3-arm64-desktop-openrc
- stage3-arm64-desktop-systemd
+ - stage3-arm64-llvm-openrc
+ - stage3-arm64-llvm-systemd
- stage3-arm64-musl
- stage3-arm64-musl-hardened
+ - stage3-arm64-musl-llvm
- stage3-arm64-openrc
- stage3-arm64-systemd
- stage3-i686-hardened-openrc
@@ -79,8 +85,11 @@ jobs:
- stage3:latest
- stage3:desktop
- stage3:hardened
+ - stage3:llvm
+ - stage3:llvm-systemd
- stage3:musl
- stage3:musl-hardened
+ - stage3:musl-llvm
- stage3:nomultilib
- stage3:nomultilib-systemd
- stage3:systemd
diff --git a/README.md b/README.md
index 171e3aa..f35bf65 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,11 @@ The following targets are built and pushed to Docker Hub:
* `amd64`
* `stage3-amd64-hardened-nomultilib-openrc`
* `stage3-amd64-hardened-openrc`
+ * `stage3-amd64-llvm-openrc`
+ * `stage3-amd64-llvm-systemd`
* `stage3-amd64-musl`
* `stage3-amd64-musl-hardened`
+ * `stage3-amd64-musl-llvm`
* `stage3-amd64-nomultilib-openrc`
* `stage3-amd64-nomultilib-systemd`
* `stage3-amd64-openrc`
@@ -43,8 +46,11 @@ The following targets are built and pushed to Docker Hub:
* `arm64`
* `stage3-arm64-desktop-openrc`
* `stage3-arm64-desktop-systemd`
+ * `stage3-arm64-llvm-openrc`
+ * `stage3-arm64-llvm-systemd`
* `stage3-arm64-musl`
* `stage3-arm64-musl-hardened`
+ * `stage3-arm64-musl-llvm`
* `stage3-arm64-openrc`
* `stage3-arm64-systemd`
* `ppc`
diff --git a/deploy-manifests.sh b/deploy-manifests.sh
index 37b735b..0073da7 100755
--- a/deploy-manifests.sh
+++ b/deploy-manifests.sh
@@ -24,12 +24,21 @@ case "${TARGET}" in
"stage3:hardened")
TAGS=("amd64-hardened-openrc" "i686-hardened-openrc")
;;
+ "stage3:llvm")
+ TAGS=("amd64-llvm-openrc" "arm64-llvm-openrc")
+ ;;
+ "stage3:llvm-systemd")
+ TAGS=("amd64-llvm-systemd" "arm64-llvm-systemd")
+ ;;
"stage3:musl")
TAGS=("amd64-musl" "armv7a_hardfp_musl-openrc" "arm64-musl" "i686-musl")
;;
"stage3:musl-hardened")
TAGS=("amd64-musl-hardened" "arm64-musl-hardened" "ppc64le-musl-hardened-openrc")
;;
+ "stage3:musl-llvm")
+ TAGS=("amd64-musl-llvm" "arm64-musl-llvm")
+ ;;
"stage3:nomultilib")
TAGS=("amd64-nomultilib-openrc")
;;
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-21 22:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-12 8:04 [gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/ Alexys Jacob
-- strict thread matches above, loose matches on Subject: below --
2024-09-21 22:12 John Helmert III
2024-02-08 3:17 John Helmert III
2023-06-29 15:22 John Helmert III
2021-12-01 11:31 Alexys Jacob
2021-08-20 18:05 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox