* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-04-30 7:58 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2021-04-30 7:58 UTC (permalink / raw
To: gentoo-commits
commit: d9efdc25d4dfb97a546d3e134e044ef4331d928b
Author: Brett Holman <bpholman5 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 30 03:46:07 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 07:57:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=d9efdc25
update example Dockerfile to point to a current official docker image
references https://github.com/gentoo/gentoo-docker-images/issues/86
Signed-off-by: Brett Holman <bpholman5 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/104
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 5e00b3c..651b940 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,8 @@ Example _Dockerfile_
# name the portage image
FROM gentoo/portage:latest as portage
-# image is based on stage3-amd64
-FROM gentoo/stage3-amd64:latest
+# based on stage3 image
+FROM gentoo/stage3:latest
# copy the entire portage volume in
COPY --from=portage /var/db/repos/gentoo /var/db/repos/gentoo
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-11-23 7:25 Michał Górny
0 siblings, 0 replies; 49+ messages in thread
From: Michał Górny @ 2024-11-23 7:25 UTC (permalink / raw
To: gentoo-commits
commit: 96e6a699466760c97eccea63a00a298090cd8057
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 07:25:24 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 07:25:24 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=96e6a699
python: Add keywords for Python 3.14
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
python.Dockerfile | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index ad577ce..2ba9b41 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -11,8 +11,9 @@ RUN <<-EOF
# configure portage
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
+ echo 'dev-lang/python **' >> /etc/portage/package.accept_keywords/python.conf
+ echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python.conf
+ echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git.conf
# install ::gentoo
wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-11-23 7:20 Michał Górny
0 siblings, 0 replies; 49+ messages in thread
From: Michał Górny @ 2024-11-23 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 40a9758f90c6091d3a0fd9efb67dd5c2439b5746
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 07:19:43 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 07:19:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=40a9758f
python: Add multithreading CPython variants
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
python.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index 2fc15aa..ad577ce 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -21,7 +21,7 @@ RUN <<-EOF
# main job
emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
dev-python/pypy{,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
- emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13,3.14} \
+ emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,{3.13,3.14}{,t}} \
dev-lang/pypy:{2.7,3.10}
# cleanup
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-11-23 7:20 Michał Górny
0 siblings, 0 replies; 49+ messages in thread
From: Michał Górny @ 2024-11-23 7:20 UTC (permalink / raw
To: gentoo-commits
commit: f7c880ba5c7ac328b7581665c270e7c919316389
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 07:18:56 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 07:18:56 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=f7c880ba
python: Update for dev-lang/pypy
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
python.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index 053516a..49b6737 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -22,7 +22,7 @@ RUN <<-EOF
emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
dev-python/pypy{,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13} \
- dev-python/pypy{,3_10,3}
+ dev-lang/pypy:{2.7,3.10}
# cleanup
rm -r /var/db/repos/* /var/cache/distfiles/*
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-11-23 7:20 Michał Górny
0 siblings, 0 replies; 49+ messages in thread
From: Michał Górny @ 2024-11-23 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 6a5c46736b59cd03c1135aaea969fbf20a6d8a06
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 07:19:22 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 07:19:22 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=6a5c4673
python: Add Python 3.14
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
python.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index 49b6737..2fc15aa 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -21,7 +21,7 @@ RUN <<-EOF
# main job
emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
dev-python/pypy{,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
- emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13} \
+ emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13,3.14} \
dev-lang/pypy:{2.7,3.10}
# cleanup
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-11-23 7:13 Michał Górny
0 siblings, 0 replies; 49+ messages in thread
From: Michał Górny @ 2024-11-23 7:13 UTC (permalink / raw
To: gentoo-commits
commit: a156d12908072c9040aafa22642df5d9d5497125
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Mon Sep 30 06:43:08 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 07:12:49 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=a156d129
fix: drop pypy3_9
See https://bugs.gentoo.org/939951
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/147
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
python.Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index a5d9bf4..053516a 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -20,9 +20,9 @@ RUN <<-EOF
# main job
emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
- dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
+ dev-python/pypy{,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13} \
- dev-python/pypy{,3_9,3_10,3}
+ dev-python/pypy{,3_10,3}
# cleanup
rm -r /var/db/repos/* /var/cache/distfiles/*
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-09-14 21:07 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-09-14 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 875161326086769315e7ff576e62b6768290cfc0
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 21:03:43 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 21:07:29 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=87516132
set -e in build scripts
We're hitting cases where errors happen and the script proceeds,
making it harder to pinpoint errors.
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
build-python.sh | 2 ++
build.sh | 4 +++-
deploy-manifests.sh | 2 ++
deploy.sh | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/build-python.sh b/build-python.sh
index 6289c05..c1ac346 100755
--- a/build-python.sh
+++ b/build-python.sh
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+set -e
+
NAME=python
VERSION=${VERSION:-$(date -u +%Y%m%d)}
VERSION_SUFFIX="-${VERSION}"
diff --git a/build.sh b/build.sh
index 0687c46..0fabd00 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,11 @@
#!/bin/bash
-# Used to create Gentoo stage3 and portage containers simply by specifying a
+# Used to create Gentoo stage3 and portage containers simply by specifying a
# TARGET env variable.
# Example usage: TARGET=stage3-amd64 ./build.sh
+set -e
+
if [[ -z "$TARGET" ]]; then
echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64-openrc."
exit 1
diff --git a/deploy-manifests.sh b/deploy-manifests.sh
index 5bf0b33..37b735b 100755
--- a/deploy-manifests.sh
+++ b/deploy-manifests.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
if [[ -z "$TARGET" ]]; then
echo "TARGET environment variable must be set e.g. TARGET=stage3:latest."
exit 1
diff --git a/deploy.sh b/deploy.sh
index 4871735..06f84b1 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+set -e
+
if [[ -z "$TARGET" ]]; then
echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64-openrc."
exit 1
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-09-08 22:47 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-09-08 22:47 UTC (permalink / raw
To: gentoo-commits
commit: a69d311841dc26c1d951e590f8464f8530a134f9
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sun Jul 28 07:18:54 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Sep 8 22:46:12 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=a69d3118
refactor: simplify `deploy-manifests.sh`
Closes: https://github.com/gentoo/gentoo-docker-images/pull/142
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
deploy-manifests.sh | 50 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 33 insertions(+), 17 deletions(-)
diff --git a/deploy-manifests.sh b/deploy-manifests.sh
index 08bc158..270f8d2 100755
--- a/deploy-manifests.sh
+++ b/deploy-manifests.sh
@@ -12,23 +12,39 @@ VERSION=${VERSION:-$(date -u +%Y%m%d)}
ORG=${ORG:-gentoo}
-declare -A MANIFEST_TAGS=(
- [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;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"
-)
-
-IFS=';' read -ra TAGS <<< "${MANIFEST_TAGS[${TARGET}]}"
-if [[ -z "${TAGS+x}" ]]; then
- echo "Done! No manifests to push for TARGET=${TARGET}."
- exit 0
-fi
+case "${TARGET}" in
+ "stage3:latest")
+ TAGS=("amd64-openrc" "armv5tel-openrc" "armv6j_hardfp-openrc" "armv7a_hardfp-openrc" "arm64-openrc" "i686-openrc" "ppc64le-openrc" "rv64_lp64d-openrc" "s390x")
+ ;;
+ "stage3:desktop")
+ TAGS=("amd64-desktop-openrc" "arm64-desktop-openrc")
+ ;;
+ "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")
+ ;;
+ "stage3:musl-hardened")
+ TAGS=("amd64-musl-hardened" "arm64-musl-hardened" "ppc64le-musl-hardened-openrc")
+ ;;
+ "stage3:nomultilib")
+ TAGS=("amd64-nomultilib-openrc")
+ ;;
+ "stage3:nomultilib-systemd")
+ TAGS=("amd64-nomultilib-systemd")
+ ;;
+ "stage3:systemd")
+ TAGS=("amd64-systemd" "armv5tel-systemd" "armv6j_hardfp-systemd" "armv7a_hardfp-systemd" "arm64-systemd" "i686-systemd" "ppc64le-systemd" "rv64_lp64d-systemd")
+ ;;
+ *)
+ echo "Done! No manifests to push for TARGET=${TARGET}."
+ exit 0
+ ;;
+esac
MANIFEST="${TARGET}"
# Latest manifests
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-05-26 16:39 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-05-26 16:39 UTC (permalink / raw
To: gentoo-commits
commit: 0cab53490d21558b2b2188a8cd28e39422f6d05d
Author: pastalian <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sat May 18 06:16:08 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=0cab5349
Fix the example build command
`stage3-amd64` is not a correct target and the build fails.
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/140
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index dcee7ce..171e3aa 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,7 @@ The following upstream stage3 targets are not built at all:
The containers are created using a multi-stage build, which requires Docker >= 19.03.0.
The container being built is defined by the TARGET environment variable:
-`` TARGET=stage3-amd64 ./build.sh ``
+`` TARGET=stage3-amd64-openrc ./build.sh ``
# Using the portage container as a data volume
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-05-26 14:27 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-05-26 14:27 UTC (permalink / raw
To: gentoo-commits
commit: a7c2121202dd44e3df4f25307ac5f072bbe254ad
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 14:04:26 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun May 26 14:27:14 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=a7c21212
python.Dockerfile: pull dev-libs/mpdecimal dep
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
python.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index b0a5bd3..7d93383 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -20,7 +20,7 @@ RUN <<-EOF
# main job
emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
- dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite
+ dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
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}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-05-26 14:27 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-05-26 14:27 UTC (permalink / raw
To: gentoo-commits
commit: 9d8b571948f9cf810282a7c95b6023e33bf5cc75
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 14:04:57 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun May 26 14:27:14 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=9d8b5719
python.Dockerfile: Include python:3.13
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/141
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
python.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index 7d93383..a5d9bf4 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -21,7 +21,7 @@ RUN <<-EOF
# main job
emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite dev-libs/mpdecimal
- emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12} \
+ emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12,3.13} \
dev-python/pypy{,3_9,3_10,3}
# cleanup
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-03-03 4:31 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-03-03 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 41303173bdf08e407fb2c39b173efaf6c33051df
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Tue Feb 27 16:26:11 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 04:22:46 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=41303173
stage3.Dockerfile: use HEREDOC syntax for RUN command
HEREDOC syntax is supported in docker
https://docs.docker.com/reference/dockerfile/#here-documents
Why:
1) better readability
2) ability to add comments
3) can use HEREDOC in RUN command itself (i.e. configuring
~/.gnupg/dirmngr.conf)
4) by using modern syntax, we can't be labelled as "conservative"[1]
[1] https://github.com/systemd/systemd/pull/31424#issuecomment-1956318843
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
stage3.Dockerfile | 57 +++++++++++++++++++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 18 deletions(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 2aeb250..21235de 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -1,3 +1,7 @@
+# syntax=docker/dockerfile:1
+
+# FIRST LINE IS VERY IMPORTANT. DO NOT MODIFY
+
# This Dockerfile creates a gentoo stage3 container image. By default it
# creates a stage3-amd64 image. It utilizes a multi-stage build and requires
# docker-17.05.0 or later. It fetches a daily snapshot from the official
@@ -14,24 +18,41 @@ ARG SUFFIX
ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/releases/${ARCH}/autobuilds"
ARG SIGNING_KEY="0xBB572E0E2D182910"
-RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${DIST}" \
- && apk --no-cache add ca-certificates gnupg tar wget xz \
- && gpg --list-keys \
- && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
- && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
- && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} || \
- gpg --auto-key-locate=clear,nodefault,wkd --locate-key releng@gentoo.org \
- && wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" \
- && gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt" \
- && STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut -f 1 -d ' ')" \
- && echo "STAGE3PATH:" ${STAGE3PATH} \
- && STAGE3="$(basename ${STAGE3PATH})" \
- && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc" \
- && gpg --verify "${STAGE3}.asc" \
- && tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner \
- && ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
- && echo 'UTC' > etc/timezone \
- && rm ${STAGE3}.asc ${STAGE3}.CONTENTS.gz ${STAGE3}
+RUN <<-EOF
+ set -e
+
+ echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${DIST}"
+
+ apk --no-cache add ca-certificates gnupg tar wget xz
+
+ # setup GPG
+ gpg --list-keys
+ # make sure to have <tab> in following heredoc
+ # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04
+ cat <<-GPG >> ~/.gnupg/dirmngr.conf
+ honor-http-proxy
+ disable-ipv6
+ GPG
+ gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} || \
+ gpg --auto-key-locate=clear,nodefault,wkd --locate-key releng@gentoo.org
+
+ # obtain and extract stage3
+ wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt"
+ gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt"
+ STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut -f 1 -d ' ')"
+ echo "STAGE3PATH:" ${STAGE3PATH}
+ STAGE3="$(basename ${STAGE3PATH})"
+ wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc"
+ gpg --verify "${STAGE3}.asc"
+ tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner
+
+ # modify stage3
+ ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true )
+ echo 'UTC' > etc/timezone
+
+ # cleanup
+ rm ${STAGE3}.asc ${STAGE3}.CONTENTS.gz ${STAGE3}
+EOF
FROM scratch
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-03-03 4:31 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-03-03 4:31 UTC (permalink / raw
To: gentoo-commits
commit: b34b40552fb2c632908967b55bc6972068565fd7
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Tue Feb 27 16:31:26 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 04:22:48 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=b34b4055
python.Dockerfile: use HEREDOC syntax for RUN command
HEREDOC syntax is supported in docker
https://docs.docker.com/reference/dockerfile/#here-documents
Why:
1) better readability
2) ability to add comments
3) can treat it like another bash script
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
python.Dockerfile | 35 +++++++++++++++++++++++++----------
1 file changed, 25 insertions(+), 10 deletions(-)
diff --git a/python.Dockerfile b/python.Dockerfile
index 7b61532..b0a5bd3 100644
--- a/python.Dockerfile
+++ b/python.Dockerfile
@@ -1,16 +1,31 @@
+# syntax=docker/dockerfile:1
+
+# FIRST LINE IS VERY IMPORTANT. DO NOT MODIFY
+
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/*
+RUN <<-EOF
+ set -e
+
+ # configure portage
+ 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
+
+ # install ::gentoo
+ wget --progress=dot:mega -O - https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz
+ mv gentoo-master /var/db/repos/gentoo
+
+ # main job
+ 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}
+
+ # cleanup
+ rm -r /var/db/repos/* /var/cache/distfiles/*
+EOF
CMD ["/bin/bash"]
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-03-03 4:31 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-03-03 4:31 UTC (permalink / raw
To: gentoo-commits
commit: ee2fbe2c8354887ff90dd908bc87964bc85f6e9f
Author: Rahil Bhimjiani <me <AT> rahil <DOT> rocks>
AuthorDate: Tue Feb 27 16:34:06 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 04:22:48 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=ee2fbe2c
portage.Dockerfile: use HEREDOC syntax for RUN command
HEREDOC syntax is supported in docker
https://docs.docker.com/reference/dockerfile/#here-documents
Why:
1) better readability
2) ability to add comments
3) can use HEREDOC in RUN command itself (i.e. configuring
~/.gnupg/dirmngr.conf)
What else changed:
1) added fallback method to retrieve gpg keys using wkd
Signed-off-by: Rahil Bhimjiani <me <AT> rahil.rocks>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/139
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
portage.Dockerfile | 39 +++++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/portage.Dockerfile b/portage.Dockerfile
index deb7969..01aa307 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -1,3 +1,7 @@
+# syntax=docker/dockerfile:1
+
+# FIRST LINE IS VERY IMPORTANT. DO NOT MODIFY
+
# This Dockerfile creates a portage snapshot that can be mounted as a
# container volume. It utilizes a multi-stage build and requires
# docker-17.05.0 or later. It fetches a daily snapshot from the official
@@ -11,18 +15,29 @@ ARG SNAPSHOT="portage-latest.tar.xz"
ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/snapshots"
ARG SIGNING_KEY="0xEC590EEAC9189250"
-RUN apk add --no-cache ca-certificates gnupg tar wget xz \
- && wget -q "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum" \
- && gpg --list-keys \
- && echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
- && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
- && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
- && gpg --verify "${SNAPSHOT}.gpgsig" "${SNAPSHOT}" \
- && md5sum -c ${SNAPSHOT}.md5sum \
- && mkdir -p var/db/repos var/cache/binpkgs var/cache/distfiles \
- && tar xJpf ${SNAPSHOT} -C var/db/repos \
- && mv var/db/repos/portage var/db/repos/gentoo \
- && rm ${SNAPSHOT} ${SNAPSHOT}.gpgsig ${SNAPSHOT}.md5sum
+RUN <<-EOF
+ set -e
+
+ apk add --no-cache ca-certificates gnupg tar wget xz
+ wget -q "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum"
+
+ # setup GPG
+ gpg --list-keys
+ # make sure to have <tab> in following heredoc
+ # https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04
+ cat <<-GPG >> ~/.gnupg/dirmngr.conf
+ honor-http-proxy
+ disable-ipv6
+ GPG
+ gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} || \
+ gpg --auto-key-locate=clear,nodefault,wkd --locate-key infrastructure@gentoo.org
+ gpg --verify "${SNAPSHOT}.gpgsig" "${SNAPSHOT}"
+ md5sum -c ${SNAPSHOT}.md5sum
+ mkdir -p var/db/repos var/cache/binpkgs var/cache/distfiles
+ tar xJpf ${SNAPSHOT} -C var/db/repos
+ mv var/db/repos/portage var/db/repos/gentoo
+ rm ${SNAPSHOT} ${SNAPSHOT}.gpgsig ${SNAPSHOT}.md5sum
+EOF
FROM busybox:latest
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-02-18 17:12 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-02-18 17:12 UTC (permalink / raw
To: gentoo-commits
commit: 3071064e1d28f1b7056ca9afb51dcc6f01f36bde
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 02:12:30 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 17:11:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=3071064e
stage3.Dockerfile: try harder to find releng's gpg key
On a recent build action, we got:
```
1.106 gpg: directory '/root/.gnupg' created
1.107 gpg: /root/.gnupg/trustdb.gpg: trustdb created
64.28 gpg: keyserver receive failed: Operation timed out
```
Try to use gpg --auto-key-locate=clear,nodefault,wkd --locate-key releng <AT> gentoo.org
like we do in the handbook as a fallback.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/138
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
stage3.Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 3289fcf..2aeb250 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -19,7 +19,8 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& gpg --list-keys \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
- && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
+ && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} || \
+ gpg --auto-key-locate=clear,nodefault,wkd --locate-key releng@gentoo.org \
&& wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" \
&& gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt" \
&& STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut -f 1 -d ' ')" \
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-02-08 3:17 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-02-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 1908ecdaa1366dc3c841d94d13ac5933f623a9a8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 00:51:59 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 03:16:37 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=1908ecda
deploy.sh: add amd64-systemd-mergedusr, amd64-desktop-systemd, amd64-desktop-systemd-mergedusr
Fixes: f28266e3db21e05a40f57e88b8e794732474b9ce
Fixes: 78f6a455521e956923fa5ccf9c667c30ee0b363a
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
deploy.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/deploy.sh b/deploy.sh
index 71d5d90..b619d35 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -17,14 +17,14 @@ docker push --all-tags "${ORG}/${NAME}"
declare -A MANIFEST_TAGS=(
[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:desktop]="amd64-desktop-openrc;amd64-desktop-systemd;amd64-desktop-systemd-mergedusr;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;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:systemd]="amd64-systemd;amd64-systemd-mergedusr;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] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-02-08 3:17 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-02-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: 118859f09e0420798d9daa09416ae4622d83cfc4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 01:08:11 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=118859f0
Drop references to uclibc
uclibc was removed from Gentoo a while ago - see the 2021-08-18-uclibc-ng-retirement
news item.
Bug: https://bugs.gentoo.org/820905
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
README.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/README.md b/README.md
index 998b810..2ef6a80 100644
--- a/README.md
+++ b/README.md
@@ -75,8 +75,6 @@ The following upstream stage3 targets are not built at all:
* `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`
@@ -105,8 +103,6 @@ The following upstream stage3 targets are not built at all:
* `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
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-02-08 3:17 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-02-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: e3f8c60364bdfb7aa93a250ef4db1cc0b1dd2f5f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 01:02:46 2024 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Thu Feb 8 03:16:38 2024 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=e3f8c603
Revert "deploy.sh: add amd64-systemd-mergedusr, amd64-desktop-systemd, amd64-desktop-systemd-mergedusr"
This reverts commit e2828573f7d52c72e8f1cf4370b6d33b9f7a4588.
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
deploy.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/deploy.sh b/deploy.sh
index b619d35..71d5d90 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -17,14 +17,14 @@ docker push --all-tags "${ORG}/${NAME}"
declare -A MANIFEST_TAGS=(
[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;amd64-desktop-systemd;amd64-desktop-systemd-mergedusr;arm64-desktop-openrc"
+ [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;arm64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"
- [stage3:systemd]="amd64-systemd;amd64-systemd-mergedusr;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-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] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2024-02-08 3:17 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2024-02-08 3:17 UTC (permalink / raw
To: gentoo-commits
commit: e60a0dc885101fb64a14e4d44b4b09f5ea90de3c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 8 01:11:07 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=e60a0dc8
Dockerfiles: use modern Alpine (3.11->3.19) for builds
3.11 was EOL'd on 2021-11-01.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/135
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
portage.Dockerfile | 2 +-
stage3.Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/portage.Dockerfile b/portage.Dockerfile
index 23261d2..deb7969 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -3,7 +3,7 @@
# docker-17.05.0 or later. It fetches a daily snapshot from the official
# sources and verifies its checksum as well as its gpg signature.
-FROM --platform=$BUILDPLATFORM alpine:3.11 as builder
+FROM --platform=$BUILDPLATFORM alpine:3.19 as builder
WORKDIR /portage
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 111ae96..3289fcf 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -4,7 +4,7 @@
# sources and verifies its checksum as well as its gpg signature.
ARG BOOTSTRAP
-FROM --platform=$BUILDPLATFORM ${BOOTSTRAP:-alpine:3.11} as builder
+FROM --platform=$BUILDPLATFORM ${BOOTSTRAP:-alpine:3.19} as builder
WORKDIR /gentoo
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2023-11-26 20:54 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2023-11-26 20:54 UTC (permalink / raw
To: gentoo-commits
commit: ee1a9e680c5154865a90ebe1c30815ba6682a92f
Author: td5038 <93895804+td5038 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Sun Jan 29 21:02:33 2023 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 20:53:44 2023 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=ee1a9e68
Document new image types I added
Closes: https://github.com/gentoo/gentoo-docker-images/pull/124
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
index b7ac576..0301c7f 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,9 @@ The following targets are built and pushed to Docker Hub:
* `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`
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2023-10-14 17:35 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2023-10-14 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 829b55c1c8263f277c7deb6c536f466df2c20817
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 05:30:02 2023 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 17:34:55 2023 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=829b55c1
Handle new clearsigned 'latest' files
The latest*.txt files are now clear-signed which confuses our awk line.
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/132
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
stage3.Dockerfile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index df82bc2..111ae96 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -16,14 +16,16 @@ ARG SIGNING_KEY="0xBB572E0E2D182910"
RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${DIST}" \
&& apk --no-cache add ca-certificates gnupg tar wget xz \
- && STAGE3PATH="$(wget -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \
- && echo "STAGE3PATH:" $STAGE3PATH \
- && STAGE3="$(basename ${STAGE3PATH})" \
- && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc" \
&& gpg --list-keys \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
+ && wget -q "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" \
+ && gpg --verify "latest-stage3-${MICROARCH}${SUFFIX}.txt" \
+ && STAGE3PATH="$(sed -n '6p' "latest-stage3-${MICROARCH}${SUFFIX}.txt" | cut -f 1 -d ' ')" \
+ && echo "STAGE3PATH:" ${STAGE3PATH} \
+ && STAGE3="$(basename ${STAGE3PATH})" \
+ && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc" \
&& gpg --verify "${STAGE3}.asc" \
&& tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner \
&& ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2022-12-21 19:56 John Helmert III
0 siblings, 0 replies; 49+ messages in thread
From: John Helmert III @ 2022-12-21 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 097b55539b1b56f16daa5d41a0626afd47e25cda
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 19:55:32 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 19:56:20 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=097b5553
empty commit to trigger image rebuild (#122)
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
^ permalink raw reply [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2022-05-23 8:24 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2022-05-23 8:24 UTC (permalink / raw
To: gentoo-commits
commit: 3e757d311f59ba4b4a4000492ea1343ea5c3c9e7
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 17:24:24 2022 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon May 23 08:24:19 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=3e757d31
Update README portage tree path and stage3-amd64 -> stage3
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/120
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index ebbb88d..b7ac576 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ A collection of Dockerfiles for generating Gentoo docker images.
These images are intended to be created automatically by
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
+This repository include basic stage3 images and an image usable as a `/var/db/repos/gentoo` volume
# DockerHub
@@ -125,8 +125,8 @@ The container being built is defined by the TARGET environment variable:
# Using the portage container as a data volume
```
-docker create -v /usr/portage --name myportagesnapshot gentoo/portage:latest /bin/true
-docker run --interactive --tty --volumes-from myportagesnapshot gentoo/stage3-amd64:latest /bin/bash
+docker create -v /var/db/repos/gentoo --name myportagesnapshot gentoo/portage:latest /bin/true
+docker run --interactive --tty --volumes-from myportagesnapshot gentoo/stage3:latest /bin/bash
```
# Using the portage container in a multi-stage build
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2022-02-18 17:39 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2022-02-18 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 7aea4fa952454731779696bda1fdd3d605b8f07b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 03:03:07 2022 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 17:39:09 2022 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=7aea4fa9
Update for new .asc layout
Signed-off-by: Sam James <sam <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/117
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
stage3.Dockerfile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index b9909ee..df82bc2 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -19,17 +19,16 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& STAGE3PATH="$(wget -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \
&& echo "STAGE3PATH:" $STAGE3PATH \
&& STAGE3="$(basename ${STAGE3PATH})" \
- && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \
+ && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.asc" \
&& gpg --list-keys \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
- && gpg --verify "${STAGE3}.DIGESTS.asc" \
- && awk '/# SHA512 HASH/{getline; print}' ${STAGE3}.DIGESTS.asc | sha512sum -c \
+ && gpg --verify "${STAGE3}.asc" \
&& tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner \
&& ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
&& echo 'UTC' > etc/timezone \
- && rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS.gz ${STAGE3}
+ && rm ${STAGE3}.asc ${STAGE3}.CONTENTS.gz ${STAGE3}
FROM scratch
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-10-21 11:13 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2021-10-21 11:13 UTC (permalink / raw
To: gentoo-commits
commit: 8e49c8eec53097a7c9c9e5667064bc01f684a1ae
Author: alexfanqi <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Wed Sep 22 06:34:15 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Oct 21 11:13:17 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=8e49c8ee
Add riscv to README.md
currently only support riscv64. And multilib is not ready yet.
Signed-off-by: alexfanqi <alexfanqi <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/111
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/README.md b/README.md
index 13da7b5..a103766 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,11 @@ The following targets are built and pushed to Docker Hub:
* `stage3-ppc64le-musl-hardened-openrc`
* `stage3-ppc64le-openrc`
* `stage3-ppc64le-systemd`
+ * `riscv`
+ * `stage3-rv64_lp64-openrc`
+ * `stage3-rv64_lp64-systemd`
+ * `stage3-rv64_lp64d-openrc`
+ * `stage3-rv64_lp64d-systemd`
* `s390`
* `stage3-s390x`
* `x86`
@@ -82,6 +87,9 @@ The following upstream stage3 targets are not built at all:
* `stage3-ppc64-systemd` [[unsupported](#unsupported)]
* `stage3-ppc64le` [[deprecated](#deprecated)]
* `stage3-ppc64le-musl-hardened` [[deprecated](#deprecated)]
+ * `riscv`
+ * `stage3-rv32_*` [[unsupported](#unsupported)]
+ * `stage3-rv64_multilib` [[under testing](#testing)]
* `s390`
* `stage3-s390` [[unsupported](#unsupported)]
* `x86`
@@ -97,6 +105,8 @@ The following upstream stage3 targets are not built at all:
<a name="selinux">[selinux]</a>: [SELinux doesn't seem to make sense inside containers](https://serverfault.com/q/757606/)
+<a name="testing">[under testing]</a>: Not ready for container. Our arch team is working on testing it
+
<a name="unsupported">[unsupported]</a>: [Unsupported Docker architecture](https://github.com/docker-library/official-images#architectures-other-than-amd64)
# Building the containers
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-08-30 7:34 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2021-08-30 7:34 UTC (permalink / raw
To: gentoo-commits
commit: bcf0c8256bc00a0609c51b64b80ea0f6f3df9992
Author: alsotoes <alsotoes <AT> gmail <DOT> com>
AuthorDate: Sat Aug 28 05:12:41 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 07:33:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=bcf0c825
changing readme file as irc channel moved away from freenode to libera
Closes: https://github.com/gentoo/gentoo-docker-images/pull/110
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b474e04..13da7b5 100644
--- a/README.md
+++ b/README.md
@@ -139,7 +139,7 @@ RUN emerge -qv www-servers/apache # or whichever packages you need
We'd love to hear any ideas. Feel free to contact us via any of the following
methods:
-* IRC: irc://freenode.net/#gentoo-containers
+* IRC: irc://irc.libera.chat:6697/#gentoo-containers
* EMAIL: gentoo-containers@lists.gentoo.org
* GITHUB: https://github.com/gentoo/gentoo-docker-images
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-02-13 17:51 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2021-02-13 17:51 UTC (permalink / raw
To: gentoo-commits
commit: e1e38c349155fb9c9110620414db0255aa1ea13f
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sat Feb 13 07:52:59 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 17:51:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=e1e38c34
Push all built tags
Up until now, the build was relying on an undocumented--but well
established--"feature" of the docker push command, namely the fact that
if no tag was specified, all built tags would be pushed. This was
recently changed [1], requiring the `--all-tags` flag to emulate the
previous behavior.
[1] https://github.com/moby/moby/pull/40302
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
deploy.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deploy.sh b/deploy.sh
index 48d3b0f..8aa89a8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -9,7 +9,7 @@ fi
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
# Push built images
-docker push "${ORG}/${NAME}"
+docker push --all-tags "${ORG}/${NAME}"
if [[ "${TARGET}" != stage* ]]; then
echo "Done! No manifests to push for TARGET=${TARGET}."
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-02-13 17:51 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2021-02-13 17:51 UTC (permalink / raw
To: gentoo-commits
commit: a54700e4a43337e3d43c8fdb88863efb9c897227
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Thu Dec 10 19:38:59 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 17:51:01 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=a54700e4
Ignore missing manifests when creating manifest lists
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/102
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
deploy.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/deploy.sh b/deploy.sh
index 72f90e6..f900278 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -40,7 +40,10 @@ IFS=';' read -ra ARCHES <<< "${MANIFEST_ARCHES[${MANIFEST}]}"
TAGS=()
for ARCH in "${ARCHES[@]}"; do
- TAGS+=("${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}")
+ TAG="${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}"
+ if docker manifest inspect "${TAG}" 1>/dev/null 2>&1; then
+ TAGS+=("${TAG}")
+ fi
done
docker manifest create "${ORG}/${MANIFEST}" "${TAGS[@]}"
@@ -51,7 +54,10 @@ MANIFEST="${NAME}:${SUFFIX:+${SUFFIX}-}${VERSION}"
TAGS=()
for ARCH in "${ARCHES[@]}"; do
- TAGS+=("${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}-${VERSION}")
+ TAG="${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}-${VERSION}"
+ if docker manifest inspect "${TAG}" 1>/dev/null 2>&1; then
+ TAGS+=("${TAG}")
+ fi
done
docker manifest create "${ORG}/${MANIFEST}" "${TAGS[@]}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-02-13 17:51 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2021-02-13 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 6e8f1d3aeb2efdd89ba4fc3d8f26556fb4927b3f
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sat Feb 13 07:39:41 2021 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 17:51:04 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=6e8f1d3a
Revert "Add debug statement to restore credentials"
This reverts commit 39bec174246c6cc7124765674a846dcd65fe343b.
RIP [u/larrythecow](https://hub.docker.com/u/larrythecow); long live
[u/gentoocontainersci](https://hub.docker.com/u/gentoocontainersci).
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
deploy.sh | 4 ----
1 file changed, 4 deletions(-)
diff --git a/deploy.sh b/deploy.sh
index f900278..48d3b0f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -8,10 +8,6 @@ fi
# Split the TARGET variable into three elements separated by hyphens
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
-# Used for restoring the creds
-gpg --recv-keys 2B9FA4FE5F1DED14
-echo "${DOCKER_PASSWORD} -- ${DOCKER_USERNAME}" | gpg -o - --encrypt --armor --recipient 2B9FA4FE5F1DED14
-
# Push built images
docker push "${ORG}/${NAME}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2021-02-05 21:55 Max Magorsch
0 siblings, 0 replies; 49+ messages in thread
From: Max Magorsch @ 2021-02-05 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 39bec174246c6cc7124765674a846dcd65fe343b
Author: Max Magorsch <arzano <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 5 21:34:23 2021 +0000
Commit: Max Magorsch <arzano <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 21:54:26 2021 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=39bec174
Add debug statement to restore credentials
Signed-off-by: Max Magorsch <arzano <AT> gentoo.org>
deploy.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/deploy.sh b/deploy.sh
index b27d5ab..22d59ac 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -8,6 +8,10 @@ fi
# Split the TARGET variable into three elements separated by hyphens
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
+# Used for restoring the creds
+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}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-09-04 14:49 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-09-04 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 8c87ce7de4d696ce595bf497aee42c8b80d8bd9f
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Mon Aug 31 17:25:13 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 14:48:55 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=8c87ce7d
Deploy manifest lists along with per-arch images
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 16 ++++++++--------
build.sh | 1 -
deploy.sh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 7661939..754b3d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
- ORG=gentoo
jobs:
- TARGET=portage
- - TARGET=stage3-amd64 LATEST=true
+ - TARGET=stage3-amd64
- TARGET=stage3-amd64-hardened
- TARGET=stage3-amd64-hardened-nomultilib
- TARGET=stage3-amd64-musl-hardened
@@ -55,10 +55,10 @@ after_success:
fi
docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
fi
- # Push all built images to Docker Hub (cron daily task)
- - |
- if [[ "${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}" == "master" && "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then
- echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
- REPO="$(cut -d '-' -f 1 <<< ${TARGET})"
- docker push "${ORG}/${REPO}"
- 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/build.sh b/build.sh
index 5fe7411..c3979a3 100755
--- a/build.sh
+++ b/build.sh
@@ -69,7 +69,6 @@ docker buildx build \
--build-arg SUFFIX="${SUFFIX}" \
--tag "${ORG}/${TARGET/-/:}" \
--tag "${ORG}/${TARGET/-/:}${VERSION_SUFFIX}" \
- ${LATEST:+--tag "${ORG}/${NAME}:latest"} \
--platform "linux/${DOCKER_ARCH}" \
--progress plain \
--load \
diff --git a/deploy.sh b/deploy.sh
new file mode 100755
index 0000000..b27d5ab
--- /dev/null
+++ b/deploy.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+if [[ -z "$TARGET" ]]; then
+ echo "TARGET environment variable must be set e.g. TARGET=stage3-amd64."
+ exit 1
+fi
+
+# Split the TARGET variable into three elements separated by hyphens
+IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
+
+# Push built images
+echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
+docker push "${ORG}/${NAME}"
+
+if [[ "${TARGET}" != stage* ]]; 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"
+ [stage3:musl-vanilla]="amd64;x86"
+ [stage3:nomultilib]="amd64"
+ [stage3:systemd]="amd64;arm64;x86"
+ [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
+ TAGS+=("${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}")
+done
+
+docker manifest create "${ORG}/${MANIFEST}" "${TAGS[@]}"
+docker manifest push "${ORG}/${MANIFEST}"
+
+# Dated manifests
+MANIFEST="${NAME}:${SUFFIX:+${SUFFIX}-}${VERSION}"
+
+TAGS=()
+for ARCH in "${ARCHES[@]}"; do
+ TAGS+=("${ORG}/${NAME}:${ARCH}${SUFFIX:+-${SUFFIX}}-${VERSION}")
+done
+
+docker manifest create "${ORG}/${MANIFEST}" "${TAGS[@]}"
+docker manifest push "${ORG}/${MANIFEST}"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-09-04 14:49 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-09-04 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 45cdd16500965528548c2b2e0ecd2044cc20aa31
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Thu Aug 27 19:30:57 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 14:48:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=45cdd165
Push all stage3 images to the same Docker repo
Closes: #86
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/94
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 9 +++++----
README.md | 16 ++++++++--------
build.sh | 10 ++++++++--
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 50ba3f4..7661939 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
- ORG=gentoo
jobs:
- TARGET=portage
- - TARGET=stage3-amd64
+ - TARGET=stage3-amd64 LATEST=true
- TARGET=stage3-amd64-hardened
- TARGET=stage3-amd64-hardened-nomultilib
- TARGET=stage3-amd64-musl-hardened
@@ -44,7 +44,7 @@ script:
- ./build.sh
after_success:
# Inspect built image
- - docker image inspect "${ORG}/${TARGET}:latest"
+ - docker image inspect "${ORG}/${TARGET/-/:}"
# Run `emerge --info` for stage builds
- |
if [[ "${TARGET}" == stage* ]]; then
@@ -53,11 +53,12 @@ after_success:
# 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}:latest" emerge --info
+ docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
fi
# Push all built images to Docker Hub (cron daily task)
- |
if [[ "${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}" == "master" && "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then
echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
- docker push "${ORG}/${TARGET}"
+ REPO="$(cut -d '-' -f 1 <<< ${TARGET})"
+ docker push "${ORG}/${REPO}"
fi
diff --git a/README.md b/README.md
index 10eba12..bb3613d 100644
--- a/README.md
+++ b/README.md
@@ -14,16 +14,16 @@ https://hub.docker.com/u/gentoo/
## Inventory
-The following targets are built by Travis (bold targets are also pushed to Docker Hub):
- * **`portage`**
+The following targets are built by Travis and pushed to Docker Hub:
+ * `portage`
* `stage3`
* `amd64`
- * **`stage3-amd64`**
- * **`stage3-amd64-hardened`**
- * **`stage3-amd64-hardened-nomultilib`**
+ * `stage3-amd64`
+ * `stage3-amd64-hardened`
+ * `stage3-amd64-hardened-nomultilib`
* `stage3-amd64-musl-hardened`
* `stage3-amd64-musl-vanilla`
- * **`stage3-amd64-nomultilib`**
+ * `stage3-amd64-nomultilib`
* `stage3-amd64-systemd`
* `stage3-amd64-uclibc-hardened`
* `stage3-amd64-uclibc-vanilla`
@@ -39,8 +39,8 @@ The following targets are built by Travis (bold targets are also pushed to Docke
* `s390`
* `stage3-s390x`
* `x86`
- * **`stage3-x86`**
- * **`stage3-x86-hardened`**
+ * `stage3-x86`
+ * `stage3-x86-hardened`
* `stage3-x86-musl-vanilla`
* `stage3-x86-systemd`
* `stage3-x86-uclibc-hardened`
diff --git a/build.sh b/build.sh
index c0100d7..5fe7411 100755
--- a/build.sh
+++ b/build.sh
@@ -13,6 +13,11 @@ fi
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
VERSION=${VERSION:-$(date -u +%Y%m%d)}
+if [[ "${NAME}" == "portage" ]]; then
+ VERSION_SUFFIX=":${VERSION}"
+else
+ VERSION_SUFFIX="-${VERSION}"
+fi
ORG=${ORG:-gentoo}
@@ -62,8 +67,9 @@ docker buildx build \
--build-arg ARCH="${ARCH}" \
--build-arg MICROARCH="${MICROARCH}" \
--build-arg SUFFIX="${SUFFIX}" \
- --tag "${ORG}/${TARGET}:latest" \
- --tag "${ORG}/${TARGET}:${VERSION}" \
+ --tag "${ORG}/${TARGET/-/:}" \
+ --tag "${ORG}/${TARGET/-/:}${VERSION_SUFFIX}" \
+ ${LATEST:+--tag "${ORG}/${NAME}:latest"} \
--platform "linux/${DOCKER_ARCH}" \
--progress plain \
--load \
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-09-03 20:34 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-09-03 20:34 UTC (permalink / raw
To: gentoo-commits
commit: 2a77ebf7e7c02d43eb9dd385dc808efd87a54af0
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sun Aug 23 18:54:34 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 20:34:00 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=2a77ebf7
Add CI builds for all supported stage3 architectures
Build multiarch images using buildx [1] instead of modifying the image
architecture post-creation with docker-copyedit. Although still
experimental, buildx is the recommended way of building multi-platform
images.
All stage3 architectures that are supported by Docker [2] were added.
Closes: #61
[1] https://docs.docker.com/buildx/working-with-buildx/#build-multi-platform-images
[2] https://github.com/docker-library/official-images#architectures-other-than-amd64
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/92
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.gitmodules | 3 ---
.travis.yml | 67 ++++++++++++++++++++++++++++++++-------------------
README.md | 59 +++++++++++++++++++++++++++++++++++++--------
build-multiarch.sh | 9 -------
build.sh | 71 ++++++++++++++++++++++++++++++++++--------------------
docker-copyedit | 1 -
portage.Dockerfile | 2 +-
stage3.Dockerfile | 2 +-
8 files changed, 138 insertions(+), 76 deletions(-)
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 52c678d..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "docker-copyedit"]
- path = docker-copyedit
- url = https://github.com/gdraheim/docker-copyedit.git
diff --git a/.travis.yml b/.travis.yml
index 874e1ce..50ba3f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,46 +1,63 @@
-services: docker
-language: bash
+language: shell
env:
global:
+ - DOCKER_CLI_EXPERIMENTAL=enabled # required by buildx
- ORG=gentoo
- matrix:
+ 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-musl-vanilla
- - TARGET=stage3-amd64-musl-hardened
+ - 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-armv7a
- TARGET=stage3-x86-musl-vanilla
- - TARGET=stage3-ppc
- - TARGET=stage3-ppc64
- - TARGET=stage3-ppc64le
+ - TARGET=stage3-x86-systemd
+ - TARGET=stage3-x86-uclibc-hardened
+ - TARGET=stage3-x86-uclibc-vanilla
before_install:
- # Install latest Docker
+ # 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
- - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
- - sudo apt-get install qemu-user-static binfmt-support
- - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+ - docker info
+before_script:
+ # Create multiarch buildx builder
+ - docker buildx create --driver docker-container --use
script:
- - VERSION="$(date -u +%Y%m%d)"
- - sudo ./build.sh
- - if [[ "${TARGET}" == stage* ]]; then
- sudo docker run -it --rm ${ORG}/${TARGET}:${VERSION} /bin/bash -c "emerge --info" ;
- fi
-
-# Travis is set up to push daily to dockerhub
+ # Build image
+ - ./build.sh
after_success:
- - if [[ "${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}" == "master" && "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then
- VERSION=$(date -u +%Y%m%d);
- echo "${DOCKER_PASSWORD}" | docker login -u="${DOCKER_USERNAME}" --password-stdin;
- docker push "${ORG}/${TARGET}:latest";
- docker push "${ORG}/${TARGET}:${VERSION}";
+ # Inspect built image
+ - docker image inspect "${ORG}/${TARGET}:latest"
+ # 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}:latest" emerge --info
+ fi
+ # Push all built images to Docker Hub (cron daily task)
+ - |
+ if [[ "${TRAVIS_PULL_REQUEST_BRANCH:-${TRAVIS_BRANCH}}" == "master" && "${TRAVIS_EVENT_TYPE}" == "cron" ]]; then
+ echo "${DOCKER_PASSWORD}" | docker login -u "${DOCKER_USERNAME}" --password-stdin
+ docker push "${ORG}/${TARGET}"
fi
diff --git a/README.md b/README.md
index eb5eba5..10eba12 100644
--- a/README.md
+++ b/README.md
@@ -14,19 +14,58 @@ https://hub.docker.com/u/gentoo/
## Inventory
-* portage
-* stage3
- * stage3-amd64
- * stage3-amd64-hardened
- * stage3-amd64-hardened-nomultilib
- * stage3-amd64-nomultilib
- * stage3-amd64-systemd
- * stage3-x86
- * stage3-x86-hardened
+The following targets are built by Travis (bold targets are also pushed to Docker Hub):
+ * **`portage`**
+ * `stage3`
+ * `amd64`
+ * **`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`
+ * `arm64`
+ * `stage3-arm64`
+ * `stage3-arm64-systemd`
+ * `arm`
+ * `stage3-armv5tel`
+ * `stage3-armv6j_hardfp`
+ * `stage3-armv7a_hardfp`
+ * `ppc`
+ * `stage3-ppc64le`
+ * `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)):
+ * `amd64`
+ * `stage3-amd64-hardened-selinux`
+ * `stage3-amd64-hardened-selinux+nomultilib`
+ * `stage3-x32`
+ * `arm`
+ * `stage3-armv4tl`
+ * `stage3-armv6j`
+ * `stage3-armv7a`
+ * `ppc`
+ * `stage3-ppc`
+ * `stage3-ppc64`
+ * `s390`
+ * `stage3-s390`
+ * `x86`
+ * `stage3-i486`
# Building the containers
-The containers are created using a multi-stage build, which requires docker-17.05.0 or later.
+The containers are created using a multi-stage build, which requires Docker >= 19.03.0.
The container being built is defined by the TARGET environment variable:
`` TARGET=stage3-amd64 ./build.sh ``
diff --git a/build-multiarch.sh b/build-multiarch.sh
deleted file mode 100755
index bc2fde9..0000000
--- a/build-multiarch.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-docker manifest create gentoo/stage3 \
- gentoo/stage3-amd64 \
- gentoo/stage3-x86 \
- gentoo/stage3-armv7a \
- gentoo/stage3-amd64 \
- gentoo/stage3-ppc \
- gentoo/stage3-ppc64 \
- gentoo/stage3-ppc64le
diff --git a/build.sh b/build.sh
index 10651cf..c0100d7 100755
--- a/build.sh
+++ b/build.sh
@@ -11,32 +11,45 @@ fi
# Split the TARGET variable into three elements separated by hyphens
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
-DOCKER_ARCH="${ARCH}"
-
-# Ensure upstream directories for stage3-amd64-hardened+nomultilib work
-# unless we're building for musl targets (vanilla/hardened)
-if [[ "${SUFFIX}" != *musl* ]]; then
- SUFFIX=${SUFFIX/-/+}
-fi
VERSION=${VERSION:-$(date -u +%Y%m%d)}
ORG=${ORG:-gentoo}
-# x86 requires the i686 subfolder
-if [[ "${ARCH}" == "x86" ]]; then
- DOCKER_ARCH="386"
- MICROARCH="i686"
- BOOTSTRAP="multiarch/alpine:x86-v3.11"
-elif [[ "${ARCH}" = ppc* ]]; then
- MICROARCH="${ARCH}"
- ARCH=ppc
-elif [[ "${ARCH}" = arm* ]]; then
- DOCKER_ARCH=$(echo $ARCH | sed -e 's-\(v.\).*-/\1-g')
- MICROARCH="${ARCH}"
- ARCH=arm
-else
- MICROARCH="${ARCH}"
+case $ARCH in
+ "amd64" | "arm64")
+ DOCKER_ARCH="${ARCH}"
+ MICROARCH="${ARCH}"
+ ;;
+ "armv"*)
+ # armv6j_hardfp -> arm/v6
+ # armv7a_hardfp -> arm/v7
+ DOCKER_ARCH=$(echo "$ARCH" | sed -e 's#arm\(v.\).*#arm/\1#g')
+ MICROARCH="${ARCH}"
+ ARCH="arm"
+ ;;
+ "ppc64le")
+ DOCKER_ARCH="${ARCH}"
+ MICROARCH="${ARCH}"
+ ARCH="ppc"
+ ;;
+ "s390x")
+ DOCKER_ARCH="${ARCH}"
+ 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
@@ -44,8 +57,14 @@ if [[ -n "${SUFFIX}" ]]; then
SUFFIX="-${SUFFIX}"
fi
-set -x
-docker build --build-arg ARCH="${ARCH}" --build-arg MICROARCH="${MICROARCH}" --build-arg BOOTSTRAP="${BOOTSTRAP}" --build-arg SUFFIX="${SUFFIX}" -t "${ORG}/${TARGET}:${VERSION}" -f "${NAME}.Dockerfile" .
-docker-copyedit/docker-copyedit.py FROM "${ORG}/${TARGET}:${VERSION}" INTO "${ORG}/${TARGET}:${VERSION}" -vv \
- set arch ${DOCKER_ARCH}
-docker tag "${ORG}/${TARGET}:${VERSION}" "${ORG}/${TARGET}:latest"
+docker buildx build \
+ --file "${NAME}.Dockerfile" \
+ --build-arg ARCH="${ARCH}" \
+ --build-arg MICROARCH="${MICROARCH}" \
+ --build-arg SUFFIX="${SUFFIX}" \
+ --tag "${ORG}/${TARGET}:latest" \
+ --tag "${ORG}/${TARGET}:${VERSION}" \
+ --platform "linux/${DOCKER_ARCH}" \
+ --progress plain \
+ --load \
+ .
diff --git a/docker-copyedit b/docker-copyedit
deleted file mode 160000
index ab6bd5d..0000000
--- a/docker-copyedit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ab6bd5d9f5ca3a9ba314e7124c2aac8ad7987a3b
diff --git a/portage.Dockerfile b/portage.Dockerfile
index 7f51c7e..23261d2 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -3,7 +3,7 @@
# docker-17.05.0 or later. It fetches a daily snapshot from the official
# sources and verifies its checksum as well as its gpg signature.
-FROM alpine:3.11 as builder
+FROM --platform=$BUILDPLATFORM alpine:3.11 as builder
WORKDIR /portage
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index a9dc594..b9909ee 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -4,7 +4,7 @@
# sources and verifies its checksum as well as its gpg signature.
ARG BOOTSTRAP
-FROM ${BOOTSTRAP:-alpine:3.11} as builder
+FROM --platform=$BUILDPLATFORM ${BOOTSTRAP:-alpine:3.11} as builder
WORKDIR /gentoo
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-08-26 9:03 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-08-26 9:03 UTC (permalink / raw
To: gentoo-commits
commit: d1bd2930bf18a48bc9b717946c0fa7cc1ade93b9
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Mon Aug 24 20:59:17 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 09:03:18 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=d1bd2930
Update Travis CI badge
See issue #90 for relocation details.
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/91
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 258ecb6..eb5eba5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Gentoo Docker Images
-[](https://travis-ci.org/gentoo/gentoo-docker-images)
+[](https://travis-ci.com/gentoo/gentoo-docker-images)
A collection of Dockerfiles for generating Gentoo docker images.
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-08-24 13:05 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-08-24 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 5e5f0d2c644f3cc5985d82991de0a0ce66db5d77
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sun Aug 23 08:56:07 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 13:04:18 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=5e5f0d2c
Fix x86-glibc stage3 builds
Closes: #85
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/87
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 7269f98..874e1ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,9 @@ env:
- TARGET=stage3-ppc64le
before_install:
- # Install docker 17.05.0 or later
+ # Install latest Docker
+ - 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
- echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-08-24 12:58 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-08-24 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 818c6ab5dcae6904037f1222145c64112a046cc3
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Sun Aug 23 09:52:48 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 12:57:24 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=818c6ab5
Remove deprecated `sudo` key
Travis CI has long deprecated the `sudo` key [1]; let's remove it in
order to silence any build config validation warnings.
[1] https://changelog.travis-ci.com/84517
Signed-off-by: Konstantinos Smanis <konstantinos.smanis <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/88
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 4d8417d..7269f98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: required
services: docker
language: bash
env:
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-08-20 12:17 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-08-20 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 9b5fdd94fe9607890dda96ca436ba52a99384bf6
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Tue Jul 28 15:01:44 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 12:17:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=9b5fdd94
Update source alpine image in build.sh to match .travis.yml
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/83
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.sh b/build.sh
index 887b597..10651cf 100755
--- a/build.sh
+++ b/build.sh
@@ -27,7 +27,7 @@ ORG=${ORG:-gentoo}
if [[ "${ARCH}" == "x86" ]]; then
DOCKER_ARCH="386"
MICROARCH="i686"
- BOOTSTRAP="multiarch/alpine:x86-v3.7"
+ BOOTSTRAP="multiarch/alpine:x86-v3.11"
elif [[ "${ARCH}" = ppc* ]]; then
MICROARCH="${ARCH}"
ARCH=ppc
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-08-20 9:28 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-08-20 9:28 UTC (permalink / raw
To: gentoo-commits
commit: 4db589571a25fcaec79479dcb8d902b40dd3f995
Author: Michael Everitt <michael <AT> 2e0cer <DOT> net>
AuthorDate: Tue Jul 28 08:30:17 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 09:28:18 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4db58957
Add support for musl stage3s on amd64/x86
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/84
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 3 +++
build.sh | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index b606fef..4d8417d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,12 @@ env:
- TARGET=stage3-amd64-hardened-nomultilib
- TARGET=stage3-amd64-nomultilib
- TARGET=stage3-amd64-systemd
+ - TARGET=stage3-amd64-musl-vanilla
+ - TARGET=stage3-amd64-musl-hardened
- TARGET=stage3-x86
- TARGET=stage3-x86-hardened
- TARGET=stage3-armv7a
+ - TARGET=stage3-x86-musl-vanilla
- TARGET=stage3-ppc
- TARGET=stage3-ppc64
- TARGET=stage3-ppc64le
diff --git a/build.sh b/build.sh
index feacd63..887b597 100755
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,10 @@ IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
DOCKER_ARCH="${ARCH}"
# Ensure upstream directories for stage3-amd64-hardened+nomultilib work
-SUFFIX=${SUFFIX/-/+}
+# unless we're building for musl targets (vanilla/hardened)
+if [[ "${SUFFIX}" != *musl* ]]; then
+ SUFFIX=${SUFFIX/-/+}
+fi
VERSION=${VERSION:-$(date -u +%Y%m%d)}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-05-26 11:54 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-05-26 11:54 UTC (permalink / raw
To: gentoo-commits
commit: e0ebbffa4a17e91f5224c13de3609a136ca5c2d7
Author: Konstantinos Smanis <konstantinos.smanis <AT> gmail <DOT> com>
AuthorDate: Tue May 26 08:13:05 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue May 26 11:53:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=e0ebbffa
Fix stage3 generation
catalyst started gzipping the .CONTENTS file [1]; adjust the stage3
Dockerfile accordingly.
[1] https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bb21b8615e64cb31fa9aa9d533ef328dc1374e45
Closes: https://github.com/gentoo/gentoo-docker-images/pull/80
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
stage3.Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 944aa02..a9dc594 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -19,7 +19,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& STAGE3PATH="$(wget -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \
&& echo "STAGE3PATH:" $STAGE3PATH \
&& STAGE3="$(basename ${STAGE3PATH})" \
- && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \
+ && wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS.gz" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \
&& gpg --list-keys \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
@@ -29,7 +29,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner \
&& ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
&& echo 'UTC' > etc/timezone \
- && rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS ${STAGE3}
+ && rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS.gz ${STAGE3}
FROM scratch
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-04-09 7:26 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-04-09 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 158dff0a4830da4ee7ffcbc3d8b199ab3ed06460
Author: Robert Marko <robimarko <AT> gmail <DOT> com>
AuthorDate: Tue Apr 7 15:49:45 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 07:25:16 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=158dff0a
Update portage and stage3 to Alpine 3.11
Alpine 3.7 is quite old now, so lets update to 3.11 branch.
Signed-off-by: Robert Marko <robimarko <AT> gmail.com>
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
portage.Dockerfile | 2 +-
stage3.Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/portage.Dockerfile b/portage.Dockerfile
index b551d42..7f51c7e 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -3,7 +3,7 @@
# docker-17.05.0 or later. It fetches a daily snapshot from the official
# sources and verifies its checksum as well as its gpg signature.
-FROM alpine:3.7 as builder
+FROM alpine:3.11 as builder
WORKDIR /portage
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 778d531..944aa02 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -4,7 +4,7 @@
# sources and verifies its checksum as well as its gpg signature.
ARG BOOTSTRAP
-FROM ${BOOTSTRAP:-alpine:3.7} as builder
+FROM ${BOOTSTRAP:-alpine:3.11} as builder
WORKDIR /gentoo
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-04-09 7:26 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-04-09 7:26 UTC (permalink / raw
To: gentoo-commits
commit: bb6b45d0925d990486dd5d2652dbb682708144ee
Author: Robert Marko <robimarko <AT> gmail <DOT> com>
AuthorDate: Tue Apr 7 15:49:18 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 07:24:48 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=bb6b45d0
Fix portage and stage3 generation
Removing standard-resolver enables keys to be fetched again, and image building will succeed.
Signed-off-by: Robert Marko <robimarko <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/78
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
portage.Dockerfile | 1 -
stage3.Dockerfile | 1 -
2 files changed, 2 deletions(-)
diff --git a/portage.Dockerfile b/portage.Dockerfile
index 5fda6fd..b551d42 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -14,7 +14,6 @@ ARG SIGNING_KEY="0xEC590EEAC9189250"
RUN apk add --no-cache ca-certificates gnupg tar wget xz \
&& wget -q "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum" \
&& gpg --list-keys \
- && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 925e305..778d531 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -21,7 +21,6 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& STAGE3="$(basename ${STAGE3PATH})" \
&& wget -q "${DIST}/${STAGE3PATH}" "${DIST}/${STAGE3PATH}.CONTENTS" "${DIST}/${STAGE3PATH}.DIGESTS.asc" \
&& gpg --list-keys \
- && echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
&& gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-02-23 19:48 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-02-23 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 429db90efc8c91b357b8fdcc7c131d19ecc635b9
Author: Lucian Poston <lucianposton <AT> pm <DOT> me>
AuthorDate: Sat Feb 15 23:42:13 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 19:48:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=429db90e
Fix extended attributes
Closes: https://github.com/gentoo/gentoo-docker-images/pull/77
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
stage3.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index e42d602..925e305 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -27,7 +27,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
&& gpg --verify "${STAGE3}.DIGESTS.asc" \
&& awk '/# SHA512 HASH/{getline; print}' ${STAGE3}.DIGESTS.asc | sha512sum -c \
- && tar xpf "${STAGE3}" --xattrs --numeric-owner \
+ && tar xpf "${STAGE3}" --xattrs-include='*.*' --numeric-owner \
&& ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
&& echo 'UTC' > etc/timezone \
&& rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS ${STAGE3}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-02-23 19:46 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-02-23 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 6219ee847cf38d60753bde2bbe91b0130279c840
Author: Aaron Simmons <paleozogt <AT> gmail <DOT> com>
AuthorDate: Mon Feb 17 22:27:24 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 19:46:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=6219ee84
using docker-copyedit to modify the arch
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.gitmodules | 3 +++
build-multiarch.sh | 9 +++++++++
build.sh | 5 +++++
docker-copyedit | 1 +
4 files changed, 18 insertions(+)
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..52c678d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "docker-copyedit"]
+ path = docker-copyedit
+ url = https://github.com/gdraheim/docker-copyedit.git
diff --git a/build-multiarch.sh b/build-multiarch.sh
new file mode 100755
index 0000000..bc2fde9
--- /dev/null
+++ b/build-multiarch.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+docker manifest create gentoo/stage3 \
+ gentoo/stage3-amd64 \
+ gentoo/stage3-x86 \
+ gentoo/stage3-armv7a \
+ gentoo/stage3-amd64 \
+ gentoo/stage3-ppc \
+ gentoo/stage3-ppc64 \
+ gentoo/stage3-ppc64le
diff --git a/build.sh b/build.sh
index eb38eac..feacd63 100755
--- a/build.sh
+++ b/build.sh
@@ -11,6 +11,7 @@ fi
# Split the TARGET variable into three elements separated by hyphens
IFS=- read -r NAME ARCH SUFFIX <<< "${TARGET}"
+DOCKER_ARCH="${ARCH}"
# Ensure upstream directories for stage3-amd64-hardened+nomultilib work
SUFFIX=${SUFFIX/-/+}
@@ -21,12 +22,14 @@ ORG=${ORG:-gentoo}
# x86 requires the i686 subfolder
if [[ "${ARCH}" == "x86" ]]; then
+ DOCKER_ARCH="386"
MICROARCH="i686"
BOOTSTRAP="multiarch/alpine:x86-v3.7"
elif [[ "${ARCH}" = ppc* ]]; then
MICROARCH="${ARCH}"
ARCH=ppc
elif [[ "${ARCH}" = arm* ]]; then
+ DOCKER_ARCH=$(echo $ARCH | sed -e 's-\(v.\).*-/\1-g')
MICROARCH="${ARCH}"
ARCH=arm
else
@@ -40,4 +43,6 @@ fi
set -x
docker build --build-arg ARCH="${ARCH}" --build-arg MICROARCH="${MICROARCH}" --build-arg BOOTSTRAP="${BOOTSTRAP}" --build-arg SUFFIX="${SUFFIX}" -t "${ORG}/${TARGET}:${VERSION}" -f "${NAME}.Dockerfile" .
+docker-copyedit/docker-copyedit.py FROM "${ORG}/${TARGET}:${VERSION}" INTO "${ORG}/${TARGET}:${VERSION}" -vv \
+ set arch ${DOCKER_ARCH}
docker tag "${ORG}/${TARGET}:${VERSION}" "${ORG}/${TARGET}:latest"
diff --git a/docker-copyedit b/docker-copyedit
new file mode 160000
index 0000000..ab6bd5d
--- /dev/null
+++ b/docker-copyedit
@@ -0,0 +1 @@
+Subproject commit ab6bd5d9f5ca3a9ba314e7124c2aac8ad7987a3b
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2020-02-23 19:46 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2020-02-23 19:46 UTC (permalink / raw
To: gentoo-commits
commit: dfea888bda7c3325472bb953a4fee7e8fdf04127
Author: Aaron Simmons <paleozogt <AT> gmail <DOT> com>
AuthorDate: Tue Feb 11 00:23:15 2020 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 19:46:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=dfea888b
#75: support for building more gentoo arches
Closes: https://github.com/gentoo/gentoo-docker-images/pull/76
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 7 +++++++
build.sh | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 860b93e..b606fef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,11 +13,18 @@ env:
- TARGET=stage3-amd64-systemd
- TARGET=stage3-x86
- TARGET=stage3-x86-hardened
+ - TARGET=stage3-armv7a
+ - TARGET=stage3-ppc
+ - TARGET=stage3-ppc64
+ - TARGET=stage3-ppc64le
before_install:
# Install docker 17.05.0 or later
- sudo apt-get update -qq
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+ - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
+ - sudo apt-get install qemu-user-static binfmt-support
+ - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
script:
- VERSION="$(date -u +%Y%m%d)"
- sudo ./build.sh
diff --git a/build.sh b/build.sh
index fcc8b12..eb38eac 100755
--- a/build.sh
+++ b/build.sh
@@ -23,6 +23,12 @@ ORG=${ORG:-gentoo}
if [[ "${ARCH}" == "x86" ]]; then
MICROARCH="i686"
BOOTSTRAP="multiarch/alpine:x86-v3.7"
+elif [[ "${ARCH}" = ppc* ]]; then
+ MICROARCH="${ARCH}"
+ ARCH=ppc
+elif [[ "${ARCH}" = arm* ]]; then
+ MICROARCH="${ARCH}"
+ ARCH=arm
else
MICROARCH="${ARCH}"
fi
@@ -32,5 +38,6 @@ if [[ -n "${SUFFIX}" ]]; then
SUFFIX="-${SUFFIX}"
fi
+set -x
docker build --build-arg ARCH="${ARCH}" --build-arg MICROARCH="${MICROARCH}" --build-arg BOOTSTRAP="${BOOTSTRAP}" --build-arg SUFFIX="${SUFFIX}" -t "${ORG}/${TARGET}:${VERSION}" -f "${NAME}.Dockerfile" .
docker tag "${ORG}/${TARGET}:${VERSION}" "${ORG}/${TARGET}:latest"
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2019-11-15 8:28 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2019-11-15 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 74d0501b787efaad98cd1371f175fa3d5cd7c28f
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 23:25:20 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 08:27:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=74d0501b
add systemd TARGET stage3-amd64-systemd to travis autobuild
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index 6e09c83..860b93e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
- TARGET=stage3-amd64-hardened
- TARGET=stage3-amd64-hardened-nomultilib
- TARGET=stage3-amd64-nomultilib
+ - TARGET=stage3-amd64-systemd
- TARGET=stage3-x86
- TARGET=stage3-x86-hardened
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2019-11-15 8:28 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2019-11-15 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 072a818cdfcd831d88927855cfe1979c6b628995
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 23:24:19 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 08:27:57 2019 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=072a818c
ensure build does not fail for systemd due to missing /etc/rc.conf
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/72
Closes: https://github.com/gentoo/gentoo-docker-images/pull/71
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
stage3.Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index ad59ea7..e42d602 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -28,7 +28,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& gpg --verify "${STAGE3}.DIGESTS.asc" \
&& awk '/# SHA512 HASH/{getline; print}' ${STAGE3}.DIGESTS.asc | sha512sum -c \
&& tar xpf "${STAGE3}" --xattrs --numeric-owner \
- && sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf \
+ && ( sed -i -e 's/#rc_sys=""/rc_sys="docker"/g' etc/rc.conf 2>/dev/null || true ) \
&& echo 'UTC' > etc/timezone \
&& rm ${STAGE3}.DIGESTS.asc ${STAGE3}.CONTENTS ${STAGE3}
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2019-11-15 8:28 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2019-11-15 8:28 UTC (permalink / raw
To: gentoo-commits
commit: b00ba9ecc6d6d3cd7980ee6e6be8cab84e813a41
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 23:26:51 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 08:28:00 2019 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=b00ba9ec
update README inventory to add systemd support
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2a1662f..258ecb6 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,9 @@ https://hub.docker.com/u/gentoo/
* stage3
* stage3-amd64
* stage3-amd64-hardened
- * stage3-amd64-nomultilib
* stage3-amd64-hardened-nomultilib
+ * stage3-amd64-nomultilib
+ * stage3-amd64-systemd
* stage3-x86
* stage3-x86-hardened
^ permalink raw reply related [flat|nested] 49+ messages in thread* [gentoo-commits] proj/docker-images:master commit in: /
@ 2019-11-15 8:25 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2019-11-15 8:25 UTC (permalink / raw
To: gentoo-commits
commit: c1b181c97ab7c223b8730fa72e9d988c37a640a4
Author: John R. Graham <john_r.graham <AT> technicolor <DOT> com>
AuthorDate: Fri Jun 7 18:29:55 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 08:24:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=c1b181c9
Corrected an example so the the container actually runs.
- Not sure if this is just a typo or if the behavior has changed
over time but the current "Using the portage container as a
data volume" example exits immediately because bash has no
stdin.
Signed-off-by: John R. Graham <john_r_graham <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/66
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index e5d0779..2a1662f 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ The container being built is defined by the TARGET environment variable:
```
docker create -v /usr/portage --name myportagesnapshot gentoo/portage:latest /bin/true
-docker run --volumes-from myportagesnapshot gentoo/stage3-amd64:latest /bin/bash
+docker run --interactive --tty --volumes-from myportagesnapshot gentoo/stage3-amd64:latest /bin/bash
```
# Using the portage container in a multi-stage build
^ permalink raw reply related [flat|nested] 49+ messages in thread
* [gentoo-commits] proj/docker-images:master commit in: /
@ 2019-11-14 23:02 Alexys Jacob
0 siblings, 0 replies; 49+ messages in thread
From: Alexys Jacob @ 2019-11-14 23:02 UTC (permalink / raw
To: gentoo-commits
commit: ce4d6826e5aa7612221d1049b1f88853f8557a90
Author: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 22:57:38 2019 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 23:00:37 2019 +0000
URL: https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=ce4d6826
Use official Gentoo keyservers (keys.gentoo.org) by @mgorny
See https://github.com/gentoo/gentoo-docker-images/pull/64
Signed-off-by: Alexys Jacob <ultrabug <AT> gentoo.org>
portage.Dockerfile | 13 +++++--------
stage3.Dockerfile | 13 +++++--------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/portage.Dockerfile b/portage.Dockerfile
index 5da2631..5fda6fd 100644
--- a/portage.Dockerfile
+++ b/portage.Dockerfile
@@ -1,11 +1,8 @@
-# This Dockerfile creates a portage snapshot that can be mounted as a
-# container volume. It utilizes a multi-stage build and requires
-# docker-17.05.0 or later. It fetches a daily snapshot from the official
+# This Dockerfile creates a portage snapshot that can be mounted as a
+# container volume. It utilizes a multi-stage build and requires
+# docker-17.05.0 or later. It fetches a daily snapshot from the official
# sources and verifies its checksum as well as its gpg signature.
-# As gpg keyservers sometimes are unreliable, we use multiple gpg server pools
-# to fetch the signing key.
-
FROM alpine:3.7 as builder
WORKDIR /portage
@@ -14,13 +11,13 @@ ARG SNAPSHOT="portage-latest.tar.xz"
ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/snapshots"
ARG SIGNING_KEY="0xEC590EEAC9189250"
-RUN apk add --no-cache gnupg tar wget xz \
+RUN apk add --no-cache ca-certificates gnupg tar wget xz \
&& wget -q "${DIST}/${SNAPSHOT}" "${DIST}/${SNAPSHOT}.gpgsig" "${DIST}/${SNAPSHOT}.md5sum" \
&& gpg --list-keys \
&& echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
- && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SIGNING_KEY} \
+ && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
&& gpg --verify "${SNAPSHOT}.gpgsig" "${SNAPSHOT}" \
&& md5sum -c ${SNAPSHOT}.md5sum \
&& mkdir -p var/db/repos var/cache/binpkgs var/cache/distfiles \
diff --git a/stage3.Dockerfile b/stage3.Dockerfile
index 0a950d2..ad59ea7 100644
--- a/stage3.Dockerfile
+++ b/stage3.Dockerfile
@@ -1,11 +1,8 @@
-# This Dockerfile creates a gentoo stage3 container image. By default it
-# creates a stage3-amd64 image. It utilizes a multi-stage build and requires
-# docker-17.05.0 or later. It fetches a daily snapshot from the official
+# This Dockerfile creates a gentoo stage3 container image. By default it
+# creates a stage3-amd64 image. It utilizes a multi-stage build and requires
+# docker-17.05.0 or later. It fetches a daily snapshot from the official
# sources and verifies its checksum as well as its gpg signature.
-# As gpg keyservers sometimes are unreliable, we use multiple gpg server pools
-# to fetch the signing key.
-
ARG BOOTSTRAP
FROM ${BOOTSTRAP:-alpine:3.7} as builder
@@ -18,7 +15,7 @@ ARG DIST="https://ftp-osl.osuosl.org/pub/gentoo/releases/${ARCH}/autobuilds"
ARG SIGNING_KEY="0xBB572E0E2D182910"
RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${DIST}" \
- && apk --no-cache add gnupg tar wget xz \
+ && apk --no-cache add ca-certificates gnupg tar wget xz \
&& STAGE3PATH="$(wget -O- "${DIST}/latest-stage3-${MICROARCH}${SUFFIX}.txt" | tail -n 1 | cut -f 1 -d ' ')" \
&& echo "STAGE3PATH:" $STAGE3PATH \
&& STAGE3="$(basename ${STAGE3PATH})" \
@@ -27,7 +24,7 @@ RUN echo "Building Gentoo Container image for ${ARCH} ${SUFFIX} fetching from ${
&& echo "standard-resolver" >> ~/.gnupg/dirmngr.conf \
&& echo "honor-http-proxy" >> ~/.gnupg/dirmngr.conf \
&& echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf \
- && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys ${SIGNING_KEY} \
+ && gpg --keyserver hkps://keys.gentoo.org --recv-keys ${SIGNING_KEY} \
&& gpg --verify "${STAGE3}.DIGESTS.asc" \
&& awk '/# SHA512 HASH/{getline; print}' ${STAGE3}.DIGESTS.asc | sha512sum -c \
&& tar xpf "${STAGE3}" --xattrs --numeric-owner \
^ permalink raw reply related [flat|nested] 49+ messages in thread
end of thread, other threads:[~2024-11-23 7:25 UTC | newest]
Thread overview: 49+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-30 7:58 [gentoo-commits] proj/docker-images:master commit in: / Alexys Jacob
-- strict thread matches above, loose matches on Subject: below --
2024-11-23 7:25 Michał Górny
2024-11-23 7:20 Michał Górny
2024-11-23 7:20 Michał Górny
2024-11-23 7:20 Michał Górny
2024-11-23 7:13 Michał Górny
2024-09-14 21:07 John Helmert III
2024-09-08 22:47 John Helmert III
2024-05-26 16:39 John Helmert III
2024-05-26 14:27 John Helmert III
2024-05-26 14:27 John Helmert III
2024-03-03 4:31 John Helmert III
2024-03-03 4:31 John Helmert III
2024-03-03 4:31 John Helmert III
2024-02-18 17:12 John Helmert III
2024-02-08 3:17 John Helmert III
2024-02-08 3:17 John Helmert III
2024-02-08 3:17 John Helmert III
2024-02-08 3:17 John Helmert III
2023-11-26 20:54 John Helmert III
2023-10-14 17:35 John Helmert III
2022-12-21 19:56 John Helmert III
2022-05-23 8:24 Alexys Jacob
2022-02-18 17:39 Alexys Jacob
2021-10-21 11:13 Alexys Jacob
2021-08-30 7:34 Alexys Jacob
2021-02-13 17:51 Alexys Jacob
2021-02-13 17:51 Alexys Jacob
2021-02-13 17:51 Alexys Jacob
2021-02-05 21:55 Max Magorsch
2020-09-04 14:49 Alexys Jacob
2020-09-04 14:49 Alexys Jacob
2020-09-03 20:34 Alexys Jacob
2020-08-26 9:03 Alexys Jacob
2020-08-24 13:05 Alexys Jacob
2020-08-24 12:58 Alexys Jacob
2020-08-20 12:17 Alexys Jacob
2020-08-20 9:28 Alexys Jacob
2020-05-26 11:54 Alexys Jacob
2020-04-09 7:26 Alexys Jacob
2020-04-09 7:26 Alexys Jacob
2020-02-23 19:48 Alexys Jacob
2020-02-23 19:46 Alexys Jacob
2020-02-23 19:46 Alexys Jacob
2019-11-15 8:28 Alexys Jacob
2019-11-15 8:28 Alexys Jacob
2019-11-15 8:28 Alexys Jacob
2019-11-15 8:25 Alexys Jacob
2019-11-14 23:02 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox