[gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/

2024-02-07 Thread John Helmert III 
commit: 4f11bfd241fc1681b7bde2aae3e05dd21a779907
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb  8 01:05:05 2024 +
Commit: John Helmert III  gentoo  org>
CommitDate: Thu Feb  8 03:16:39 2024 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4f11bfd2

Switch systemd images to mergedusr

In bug #917143, we stopped building non-merged-usr stage3s following the
2022-12-01-systemd-usrmerge news item a while prior, as upstream systemd
no longer support non-merged-usr.

The stages for systemd w/ non-merged-usr are no being built, so the last one
we picked up was stage3-amd64-systemd-20231210T170356Z.tar.xz (and so on).

Switch all systemd images accordingly to merged-usr.

Bug: https://bugs.gentoo.org/915958
Bug: https://bugs.gentoo.org/917143
Closes: https://github.com/gentoo/gentoo-docker-images/issues/136
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml | 28 +---
 README.md   | 32 +++-
 deploy.sh   |  4 ++--
 3 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a22ace1..c2bc5dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,43 +21,41 @@ jobs:
   - stage3-amd64-musl
   - stage3-amd64-musl-hardened
   - stage3-amd64-nomultilib-openrc
-  - stage3-amd64-nomultilib-systemd
+  - stage3-amd64-nomultilib-systemd-mergedusr
   - stage3-amd64-openrc
   - stage3-amd64-desktop-openrc
-  - stage3-amd64-systemd
   - stage3-amd64-systemd-mergedusr
-  - stage3-amd64-desktop-systemd
   - stage3-amd64-desktop-systemd-mergedusr
   - stage3-armv5tel-openrc
-  - stage3-armv5tel-systemd
+  - stage3-armv5tel-systemd-mergedusr
   - stage3-armv6j-openrc
-  - stage3-armv6j-systemd
+  - stage3-armv6j-systemd-mergedusr
   - stage3-armv6j_hardfp-openrc
-  - stage3-armv6j_hardfp-systemd
+  - stage3-armv6j_hardfp-systemd-mergedusr
   - stage3-armv7a-openrc
-  - stage3-armv7a-systemd
+  - stage3-armv7a-systemd-mergedusr
   - stage3-armv7a_hardfp_musl-openrc
   - stage3-armv7a_hardfp-openrc
-  - stage3-armv7a_hardfp-systemd
+  - stage3-armv7a_hardfp-systemd-mergedusr
   - stage3-arm64-desktop-openrc
-  - stage3-arm64-desktop-systemd
+  - stage3-arm64-desktop-systemd-mergedusr
   - stage3-arm64-musl
   - stage3-arm64-musl-hardened
   - stage3-arm64-openrc
-  - stage3-arm64-systemd
+  - stage3-arm64-systemd-mergedusr
   - stage3-i686-hardened-openrc
   - stage3-i686-musl
   - stage3-i686-openrc
-  - stage3-i686-systemd
+  - stage3-i686-systemd-mergedusr
   - stage3-ppc64le-musl-hardened-openrc
   - stage3-ppc64le-openrc
-  - stage3-ppc64le-systemd
+  - stage3-ppc64le-systemd-mergedusr
   - stage3-rv64_lp64-openrc
-  - stage3-rv64_lp64-systemd
+  - stage3-rv64_lp64-systemd-mergedusr
   - stage3-rv64_lp64d-openrc
-  - stage3-rv64_lp64d-systemd
+  - stage3-rv64_lp64d-systemd-mergedusr
   - stage3-s390x-openrc
-  - stage3-s390x-systemd
+  - stage3-s390x-systemd-mergedusr
 name: ${{ matrix.target }}
 runs-on: ubuntu-latest
 steps:

diff --git a/README.md b/README.md
index 0301c7f..998b810 100644
--- a/README.md
+++ b/README.md
@@ -23,48 +23,46 @@ The following targets are built and pushed to Docker Hub:
  * `stage3-amd64-musl`
  * `stage3-amd64-musl-hardened`
  * `stage3-amd64-nomultilib-openrc`
- * `stage3-amd64-nomultilib-systemd`
+ * `stage3-amd64-nomultilib-systemd-mergedusr`
  * `stage3-amd64-openrc`
  * `stage3-amd64-desktop-openrc`
- * `stage3-amd64-systemd`
  * `stage3-amd64-systemd-mergedusr`
- * `stage3-amd64-desktop-systemd`
  * `stage3-amd64-desktop-systemd-mergedusr`
* `arm`
  * `stage3-armv5tel-openrc`
- * `stage3-armv5tel-systemd`
+ * `stage3-armv5tel-systemd-mergedusr`
  * `stage3-armv6j-openrc`
- * `stage3-armv6j-systemd`
+ * `stage3-armv6j-systemd-mergedusr`
  * `stage3-armv6j_hardfp-openrc`
- * `stage3-armv6j_hardfp-systemd`
+ * `stage3-armv6j_hardfp-systemd-mergedusr`
  * `stage3-armv7a-openrc`
- * `stage3-armv7a-systemd`
+ * `stage3-armv7a-systemd-mergedusr`
  * `stage3-armv7a_hardfp_musl-openrc`
  * `stage3-armv7a_hardfp-openrc`
- * `stage3-armv7a_hardfp-systemd`
+ * `stage3-armv7a_hardfp-systemd-mergedusr`
* `arm64`
  * `stage3-arm64-desktop-openrc`
- * `stage3-arm64-desktop-systemd`
+ * `stage3-arm64-desktop-systemd-mergedusr`
  * `stage3-arm64-musl`
  *

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/

2023-11-26 Thread John Helmert III 
commit: 78f6a455521e956923fa5ccf9c667c30ee0b363a
Author: td5038 <93895804+td5038  users  noreply  github  
com>
AuthorDate: Sun Jan 29 20:54:23 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Nov 26 20:53:23 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=78f6a455

Round out systemd desktop containers

Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f65817a..d0e22e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
   - stage3-amd64-openrc
   - stage3-amd64-desktop-openrc
   - stage3-amd64-systemd
+  - stage3-amd64-desktop-systemd
   - stage3-armv5tel-openrc
   - stage3-armv5tel-systemd
   - stage3-armv6j-openrc

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/

2023-11-26 Thread John Helmert III 
commit: f28266e3db21e05a40f57e88b8e794732474b9ce
Author: td5038 <93895804+td5038  users  noreply  github  
com>
AuthorDate: Sun Jan 29 21:00:23 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Nov 26 20:53:38 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=f28266e3

Add mergedusr support on amd64

Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d0e22e8..a22ace1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,9 @@ jobs:
   - stage3-amd64-openrc
   - stage3-amd64-desktop-openrc
   - stage3-amd64-systemd
+  - stage3-amd64-systemd-mergedusr
   - stage3-amd64-desktop-systemd
+  - stage3-amd64-desktop-systemd-mergedusr
   - stage3-armv5tel-openrc
   - stage3-armv5tel-systemd
   - stage3-armv6j-openrc

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, .github/actions/container_build/

2023-10-14 Thread John Helmert III 
commit: d7e9b1ab0b92cc81c0cc6c589e713c78e8b8df2b
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Oct 14 17:19:46 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Oct 14 17:19:46 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=d7e9b1ab

split iamge build steps into dedicated actions file

Signed-off-by: John Helmert III  gentoo.org>

 .github/actions/container_build/action.yml | 46 ++
 .github/workflows/build.yml| 32 -
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/.github/actions/container_build/action.yml 
b/.github/actions/container_build/action.yml
new file mode 100644
index 000..bef1441
--- /dev/null
+++ b/.github/actions/container_build/action.yml
@@ -0,0 +1,46 @@
+---
+name: Build
+inputs:
+  target:
+required: true
+  dockerhub_username:
+required: true
+  dockerhub_password:
+required: true
+runs:
+  using: composite
+  steps:
+- name: Set up QEMU
+  uses: docker/setup-qemu-action@v2
+- name: Set up buildx
+  uses: docker/setup-buildx-action@v2
+- name: Set up TARGET
+  run: echo "TARGET=${{ inputs.target }}" | tee $GITHUB_ENV
+  shell: bash
+- name: Build image
+  if: startswith(inputs.target, 'stage3') || startswith(inputs.target, 
'portage')
+  shell: bash
+  run: ./build.sh
+- name: Build python image
+  if: startswith(inputs.target, 'python')
+  shell: bash
+  run: ./build-python.sh
+- name: Inspect image
+  shell: bash
+  run: docker image inspect "${ORG}/${TARGET/-/:}"
+- name: Inspect portage
+  if: matrix.target != 'portage'
+  shell: bash
+  run: docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
+- name: Login to DockerHub
+  uses: docker/login-action@v2
+  if: github.event_name == 'schedule'
+  with:
+username: ${{ inputs.dockerhub_username }}
+password: ${{ inputs.dockerhub_password }}
+- name: Push image
+  if: github.event_name == 'schedule'
+  shell: bash
+  env:
+DOCKER_CLI_EXPERIMENTAL: enabled
+  run: ./deploy.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ef4e56f..cb95b19 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,34 +58,12 @@ jobs:
   - stage3-s390x-systemd
 name: ${{ matrix.target }}
 runs-on: ubuntu-latest
-env:
-  TARGET: ${{ matrix.target }}
 steps:
   - name: Checkout code
 uses: actions/checkout@v3
-  - name: Set up QEMU
-uses: docker/setup-qemu-action@v2
-  - name: Set up buildx
-uses: docker/setup-buildx-action@v2
-  - name: Build image
-if: startswith(matrix.target, 'stage3') || startswith(matrix.target, 
'portage')
-run: ./build.sh
-  - name: Build python image
-if: startswith( matrix.target, 'python')
-run: ./build-python.sh
-  - name: Inspect image
-run: docker image inspect "${ORG}/${TARGET/-/:}"
-  - name: Inspect portage
-if: matrix.target != 'portage'
-run: docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
-  - name: Login to DockerHub
-uses: docker/login-action@v2
-if: github.event_name == 'schedule'
+  - name: Build ${{ matrix.target }}
+uses: ./.github/actions/container_build
 with:
-  username: ${{ secrets.DOCKERHUB_USERNAME }}
-  password: ${{ secrets.DOCKERHUB_PASSWORD }}
-  - name: Push image
-if: github.event_name == 'schedule'
-env:
-  DOCKER_CLI_EXPERIMENTAL: enabled
-run: ./deploy.sh
+  target: ${{ matrix.target }}
+  dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+  dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/

2023-10-14 Thread John Helmert III 
commit: 52fbc593365dba5717f9f98997632ed1afa20a2b
Author: John Helmert III  gentoo  org>
AuthorDate: Sat Oct 14 17:19:48 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sat Oct 14 17:19:48 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=52fbc593

actions: move portage to its own daily job

gentoo.git is updated far more than weekly, so only rebuilding weekly
makes little sense in this case. Instead, rebuild it daily so that
syncing downstream is less necessary.

Closes: https://github.com/gentoo/gentoo-docker-images/issues/129
Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml   |  1 -
 .github/workflows/portage.yml | 30 ++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb95b19..f65817a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,6 @@ jobs:
   matrix:
 target:
   - python
-  - portage
   - stage3-amd64-hardened-nomultilib-openrc
   - stage3-amd64-hardened-openrc
   - stage3-amd64-musl

diff --git a/.github/workflows/portage.yml b/.github/workflows/portage.yml
new file mode 100644
index 000..a305bb8
--- /dev/null
+++ b/.github/workflows/portage.yml
@@ -0,0 +1,30 @@
+name: portage
+
+on:
+  schedule:
+- cron: '0 1 * * *'
+  push:
+  pull_request:
+
+env:
+  ORG: gentoo
+
+jobs:
+  portage:
+# some boilerplate kept for alignment with build.yml
+strategy:
+  fail-fast: false
+  matrix:
+target:
+  - portage
+name: ${{ matrix.target }}
+runs-on: ubuntu-latest
+steps:
+  - name: Checkout code
+uses: actions/checkout@v3
+  - name: Build ${{ matrix.target }}
+uses: ./.github/actions/container_build
+with:
+  target: ${{ matrix.target }}
+  dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
+  dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

[gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/

2023-06-29 Thread John Helmert III 
commit: c98033b1dc679a5e3ded53ee52ad15e738eeb0a0
Author: John Helmert III  gentoo  org>
AuthorDate: Thu Jun 29 02:22:56 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Thu Jun 29 15:22:35 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=c98033b1

add plumbing to produce a python testing image

Closes: #73
Signed-off-by: John Helmert III  gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/128

 .github/workflows/build.yml |  5 +
 build-python.sh | 17 +
 python.Dockerfile   | 16 
 3 files changed, 38 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 021efcc..ef4e56f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,6 +15,7 @@ jobs:
   fail-fast: false
   matrix:
 target:
+  - python
   - portage
   - stage3-amd64-hardened-nomultilib-openrc
   - stage3-amd64-hardened-openrc
@@ -67,7 +68,11 @@ jobs:
   - name: Set up buildx
 uses: docker/setup-buildx-action@v2
   - name: Build image
+if: startswith(matrix.target, 'stage3') || startswith(matrix.target, 
'portage')
 run: ./build.sh
+  - name: Build python image
+if: startswith( matrix.target, 'python')
+run: ./build-python.sh
   - name: Inspect image
 run: docker image inspect "${ORG}/${TARGET/-/:}"
   - name: Inspect portage

diff --git a/build-python.sh b/build-python.sh
new file mode 100755
index 000..6289c05
--- /dev/null
+++ b/build-python.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+NAME=python
+VERSION=${VERSION:-$(date -u +%Y%m%d)}
+VERSION_SUFFIX="-${VERSION}"
+
+ORG=${ORG:-gentoo}
+
+docker buildx build \
+   --file "${NAME}.Dockerfile" \
+   --build-arg ARCH="amd64" \
+   --build-arg MICROARCH="amd64" \
+   --tag "${ORG}/python" \
+   --platform "linux/amd64" \
+   --progress plain \
+   --load \
+   .

diff --git a/python.Dockerfile b/python.Dockerfile
new file mode 100644
index 000..7b61532
--- /dev/null
+++ b/python.Dockerfile
@@ -0,0 +1,16 @@
+FROM gentoo/stage3:amd64-nomultilib-openrc
+
+# derived from 
https://github.com/projg2/gentoo-python-image/blob/master/Dockerfile
+
+RUN echo '*/* ~amd64' >> /etc/portage/package.accept_keywords/base.conf \
+ && echo '*/* full-stdlib sqlite' >> /etc/portage/package.use/python \
+ && echo 'dev-vcs/git -perl' >> /etc/portage/package.use/git \
+ && wget --progress=dot:mega -O - 
https://github.com/gentoo-mirror/gentoo/archive/master.tar.gz | tar -xz \
+ && mv gentoo-master /var/db/repos/gentoo \
+ && emerge -1vnt --jobs dev-python/tox app-arch/lzip dev-vcs/git \
+dev-python/pypy{,3_9,3_10}-exe-bin dev-db/sqlite \
+ && emerge -1v --jobs --nodeps dev-lang/python:{2.7,3.8,3.9,3.10,3.11,3.12} \
+dev-python/pypy{,3_9,3_10,3} \
+ && rm -r /var/db/repos/* /var/cache/distfiles/*
+
+CMD ["/bin/bash"]

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/

2023-04-02 Thread John Helmert III 
commit: 8a6a93d76ceec93ee59159f40b7375176744388d
Author: Konstantinos Smanis  gmail  com>
AuthorDate: Sun Apr  2 20:29:59 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Apr  2 22:36:30 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=8a6a93d7

Bump CI actions to silence warnings

Signed-off-by: Konstantinos Smanis  gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/127
Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 21ac503..021efcc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,11 +61,11 @@ jobs:
   TARGET: ${{ matrix.target }}
 steps:
   - name: Checkout code
-uses: actions/checkout@v2
+uses: actions/checkout@v3
   - name: Set up QEMU
-uses: docker/setup-qemu-action@v1
+uses: docker/setup-qemu-action@v2
   - name: Set up buildx
-uses: docker/setup-buildx-action@v1
+uses: docker/setup-buildx-action@v2
   - name: Build image
 run: ./build.sh
   - name: Inspect image
@@ -74,7 +74,7 @@ jobs:
 if: matrix.target != 'portage'
 run: docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
   - name: Login to DockerHub
-uses: docker/login-action@v1
+uses: docker/login-action@v2
 if: github.event_name == 'schedule'
 with:
   username: ${{ secrets.DOCKERHUB_USERNAME }}

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/

2023-01-07 Thread John Helmert III 
commit: 86cf8901ad40b9cfd2d8ccc0211f2a0978f131f0
Author: John Helmert III  gentoo  org>
AuthorDate: Sun Jan  8 02:31:12 2023 +
Commit: John Helmert III  gentoo  org>
CommitDate: Sun Jan  8 02:48:30 2023 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=86cf8901

adjust s390x image names

Should fix s390x builds.

Closes: https://github.com/gentoo/gentoo-docker-images/pull/123
Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b13e6a9..21ac503 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,7 +53,8 @@ jobs:
   - stage3-rv64_lp64-systemd
   - stage3-rv64_lp64d-openrc
   - stage3-rv64_lp64d-systemd
-  - stage3-s390x
+  - stage3-s390x-openrc
+  - stage3-s390x-systemd
 name: ${{ matrix.target }}
 runs-on: ubuntu-latest
 env:

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/

2022-09-28 Thread John Helmert III 
commit: 448f4fc3f3d4be9e65e5e3894048f6d3a11b2947
Author: John Helmert III  gentoo  org>
AuthorDate: Thu Sep 29 04:56:03 2022 +
Commit: John Helmert III  gentoo  org>
CommitDate: Thu Sep 29 04:56:03 2022 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=448f4fc3

Only rebuild images weekly

Doing it any more than this is wasteful, because the underlying stages
aren't actually changing at all.

Closes: https://bugs.gentoo.org/870619
Signed-off-by: John Helmert III  gentoo.org>

 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1fb11d8..b13e6a9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: build
 
 on:
   schedule:
-- cron: '0 1 * * *'
+- cron: '0 0 * * 1'
   push:
   pull_request:

[gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/

2022-04-12 Thread Alexys Jacob 
commit: 4f7db8bb687e27d46c22560bc881c85fbf614220
Author: Konstantinos Smanis  gmail  com>
AuthorDate: Sun Mar 20 13:34:18 2022 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Tue Apr 12 08:04:02 2022 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=4f7db8bb

Fix arm64 stage3 builds

Signed-off-by: Konstantinos Smanis  gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/119
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 5 -
 README.md   | 5 -
 deploy.sh   | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2284dd..1fb11d8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,8 +36,11 @@ jobs:
   - stage3-armv7a_hardfp_musl-openrc
   - stage3-armv7a_hardfp-openrc
   - stage3-armv7a_hardfp-systemd
-  - stage3-arm64
+  - stage3-arm64-desktop-openrc
+  - stage3-arm64-desktop-systemd
   - stage3-arm64-musl
+  - stage3-arm64-musl-hardened
+  - stage3-arm64-openrc
   - stage3-arm64-systemd
   - stage3-i686-hardened-openrc
   - stage3-i686-musl

diff --git a/README.md b/README.md
index a95ee11..ebbb88d 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,11 @@ The following targets are built and pushed to Docker Hub:
  * `stage3-armv7a_hardfp-openrc`
  * `stage3-armv7a_hardfp-systemd`
* `arm64`
- * `stage3-arm64`
+ * `stage3-arm64-desktop-openrc`
+ * `stage3-arm64-desktop-systemd`
  * `stage3-arm64-musl`
+ * `stage3-arm64-musl-hardened`
+ * `stage3-arm64-openrc`
  * `stage3-arm64-systemd`
* `ppc`
  * `stage3-ppc64le-musl-hardened-openrc`

diff --git a/deploy.sh b/deploy.sh
index eb584f5..71d5d90 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,12 +16,12 @@ ORG=${ORG:-gentoo}
 docker push --all-tags "${ORG}/${NAME}"
 
 declare -A MANIFEST_TAGS=(
-   
[stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
-   [stage3:desktop]="amd64-desktop-openrc"
+   
[stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64-openrc;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
+   [stage3:desktop]="amd64-desktop-openrc;arm64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"

[stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl"
-   
[stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
+   
[stage3:musl-hardened]="amd64-musl-hardened;arm64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"

[stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd"

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /

2022-03-02 Thread Alexys Jacob 
commit: 7d51c9af872c7277bfb07001ca3cd22dcb5b58cb
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 23:36:37 2022 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Wed Mar  2 11:24:18 2022 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=7d51c9af

Build arm64-musl image

Bug: https://github.com/rui314/mold/issues/281
Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 1 +
 README.md   | 1 +
 deploy.sh   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a58b93c..c177b11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,6 +36,7 @@ jobs:
   - stage3-armv7a_hardfp-openrc
   - stage3-armv7a_hardfp-systemd
   - stage3-arm64
+  - stage3-arm64-musl
   - stage3-arm64-systemd
   - stage3-i686-hardened-openrc
   - stage3-i686-musl

diff --git a/README.md b/README.md
index bc76134..5242b60 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ The following targets are built and pushed to Docker Hub:
  * `stage3-armv7a_hardfp-systemd`
* `arm64`
  * `stage3-arm64`
+ * `stage3-arm64-musl`
  * `stage3-arm64-systemd`
* `ppc`
  * `stage3-ppc64le-musl-hardened-openrc`

diff --git a/deploy.sh b/deploy.sh
index bd8ee55..1659f5e 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -20,7 +20,7 @@ declare -A MANIFEST_TAGS=(
[stage3:desktop]="amd64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
-   [stage3:musl]="amd64-musl;i686-musl"
+   [stage3:musl]="amd64-musl;arm64-musl;i686-musl"

[stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /

2022-03-02 Thread Alexys Jacob 
commit: 2d6db82c10268ee20b7ced2e32e013142ded4b2b
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 20 23:38:40 2022 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Wed Mar  2 11:24:21 2022 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=2d6db82c

Build armv7a_hardfp_musl-openrc image

Signed-off-by: Sam James  gentoo.org>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/118
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 1 +
 README.md   | 1 +
 deploy.sh   | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c177b11..a2284dd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,6 +33,7 @@ jobs:
   - stage3-armv6j_hardfp-systemd
   - stage3-armv7a-openrc
   - stage3-armv7a-systemd
+  - stage3-armv7a_hardfp_musl-openrc
   - stage3-armv7a_hardfp-openrc
   - stage3-armv7a_hardfp-systemd
   - stage3-arm64

diff --git a/README.md b/README.md
index 5242b60..a95ee11 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,7 @@ The following targets are built and pushed to Docker Hub:
  * `stage3-armv6j_hardfp-systemd`
  * `stage3-armv7a-openrc`
  * `stage3-armv7a-systemd`
+ * `stage3-armv7a_hardfp_musl-openrc`
  * `stage3-armv7a_hardfp-openrc`
  * `stage3-armv7a_hardfp-systemd`
* `arm64`

diff --git a/deploy.sh b/deploy.sh
index 1659f5e..eb584f5 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -20,7 +20,7 @@ declare -A MANIFEST_TAGS=(
[stage3:desktop]="amd64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
-   [stage3:musl]="amd64-musl;arm64-musl;i686-musl"
+   
[stage3:musl]="amd64-musl;armv7a_hardfp_musl-openrc;arm64-musl;i686-musl"

[stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /

2022-02-18 Thread Alexys Jacob 
commit: cfd6eff35b999bfe1677a3bd0a5564af5a7035db
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb 15 02:57:41 2022 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri Feb 18 17:39:07 2022 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=cfd6eff3

Add stage3:desktop (just amd64-desktop-openrc for now)

In particular, this is useful for CI for upstreams who don't
want to have to build X etc just to run their test suite.

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 1 +
 README.md   | 1 +
 deploy.sh   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7d93d8f..a58b93c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,7 @@ jobs:
   - stage3-amd64-nomultilib-openrc
   - stage3-amd64-nomultilib-systemd
   - stage3-amd64-openrc
+  - stage3-amd64-desktop-openrc
   - stage3-amd64-systemd
   - stage3-armv5tel-openrc
   - stage3-armv5tel-systemd

diff --git a/README.md b/README.md
index 647eaf9..bc76134 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ The following targets are built and pushed to Docker Hub:
  * `stage3-amd64-nomultilib-openrc`
  * `stage3-amd64-nomultilib-systemd`
  * `stage3-amd64-openrc`
+ * `stage3-amd64-desktop-openrc`
  * `stage3-amd64-systemd`
* `arm`
  * `stage3-armv5tel-openrc`

diff --git a/deploy.sh b/deploy.sh
index da691f3..bd8ee55 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -17,6 +17,7 @@ docker push --all-tags "${ORG}/${NAME}"
 
 declare -A MANIFEST_TAGS=(

[stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
+   [stage3:desktop]="amd64-desktop-openrc"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
[stage3:musl]="amd64-musl;i686-musl"

[gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/

2021-12-01 Thread Alexys Jacob 
commit: 72f09f90c16350954c623b5f6e3c403dea847ce1
Author: Konstantinos Smanis  gmail  com>
AuthorDate: Mon Nov 22 19:27:45 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Wed Dec  1 11:31:36 2021 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=72f09f90

Fix armv*-openrc stage3 builds

Signed-off-by: Konstantinos Smanis  gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/112
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 10 +-
 README.md   | 10 +-
 deploy.sh   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eb666ee..7d93d8f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,15 +24,15 @@ jobs:
   - stage3-amd64-nomultilib-systemd
   - stage3-amd64-openrc
   - stage3-amd64-systemd
-  - stage3-armv5tel
+  - stage3-armv5tel-openrc
   - stage3-armv5tel-systemd
-  - stage3-armv6j
+  - stage3-armv6j-openrc
   - stage3-armv6j-systemd
-  - stage3-armv6j_hardfp
+  - stage3-armv6j_hardfp-openrc
   - stage3-armv6j_hardfp-systemd
-  - stage3-armv7a
+  - stage3-armv7a-openrc
   - stage3-armv7a-systemd
-  - stage3-armv7a_hardfp
+  - stage3-armv7a_hardfp-openrc
   - stage3-armv7a_hardfp-systemd
   - stage3-arm64
   - stage3-arm64-systemd

diff --git a/README.md b/README.md
index a103766..647eaf9 100644
--- a/README.md
+++ b/README.md
@@ -27,15 +27,15 @@ The following targets are built and pushed to Docker Hub:
  * `stage3-amd64-openrc`
  * `stage3-amd64-systemd`
* `arm`
- * `stage3-armv5tel`
+ * `stage3-armv5tel-openrc`
  * `stage3-armv5tel-systemd`
- * `stage3-armv6j`
+ * `stage3-armv6j-openrc`
  * `stage3-armv6j-systemd`
- * `stage3-armv6j_hardfp`
+ * `stage3-armv6j_hardfp-openrc`
  * `stage3-armv6j_hardfp-systemd`
- * `stage3-armv7a`
+ * `stage3-armv7a-openrc`
  * `stage3-armv7a-systemd`
- * `stage3-armv7a_hardfp`
+ * `stage3-armv7a_hardfp-openrc`
  * `stage3-armv7a_hardfp-systemd`
* `arm64`
  * `stage3-arm64`

diff --git a/deploy.sh b/deploy.sh
index 871f901..da691f3 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,7 +16,7 @@ ORG=${ORG:-gentoo}
 docker push --all-tags "${ORG}/${NAME}"
 
 declare -A MANIFEST_TAGS=(
-   
[stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
+   
[stage3:latest]="amd64-openrc;armv5tel-openrc;armv6j_hardfp-openrc;armv7a_hardfp-openrc;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
[stage3:musl]="amd64-musl;i686-musl"

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /

2021-10-21 Thread Alexys Jacob 
commit: 40604346053c47a0ae23590f47053d3b56801b6a
Author: alexfanqi  yahoo  com>
AuthorDate: Wed Sep 22 01:48:48 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Thu Oct 21 11:13:13 2021 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=40604346

generate containers for riscv64 (lp64 & lp64d one-level)

multilib support is still under testing. leave it out for now

Signed-off-by: alexfanqi  yahoo.com>
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 4 
 build.sh| 6 ++
 deploy.sh   | 4 ++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a5ec941..eb666ee 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,6 +43,10 @@ jobs:
   - stage3-ppc64le-musl-hardened-openrc
   - stage3-ppc64le-openrc
   - stage3-ppc64le-systemd
+  - stage3-rv64_lp64-openrc
+  - stage3-rv64_lp64-systemd
+  - stage3-rv64_lp64d-openrc
+  - stage3-rv64_lp64d-systemd
   - stage3-s390x
 name: ${{ matrix.target }}
 runs-on: ubuntu-latest

diff --git a/build.sh b/build.sh
index f17641b..0687c46 100755
--- a/build.sh
+++ b/build.sh
@@ -43,6 +43,12 @@ case $ARCH in
MICROARCH="${ARCH}"
ARCH="ppc"
;;
+   "rv64_"*)
+   # only support riscv64 for now
+   DOCKER_ARCH=riscv64
+   MICROARCH="${ARCH}"
+   ARCH="riscv"
+   ;;
"s390x")
DOCKER_ARCH="${ARCH}"
MICROARCH="${ARCH}"

diff --git a/deploy.sh b/deploy.sh
index 877c6eb..871f901 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -16,14 +16,14 @@ ORG=${ORG:-gentoo}
 docker push --all-tags "${ORG}/${NAME}"
 
 declare -A MANIFEST_TAGS=(
-   
[stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;s390x"
+   
[stage3:latest]="amd64-openrc;armv5tel;armv6j_hardfp;armv7a_hardfp;arm64;i686-openrc;ppc64le-openrc;rv64_lp64d-openrc;s390x"
[stage3:hardened]="amd64-hardened-openrc;i686-hardened-openrc"
[stage3:hardened-nomultilib]="amd64-hardened-nomultilib-openrc"
[stage3:musl]="amd64-musl;i686-musl"

[stage3:musl-hardened]="amd64-musl-hardened;ppc64le-musl-hardened-openrc"
[stage3:nomultilib]="amd64-nomultilib-openrc"
[stage3:nomultilib-systemd]="amd64-nomultilib-systemd"
-   
[stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd"
+   
[stage3:systemd]="amd64-systemd;armv5tel-systemd;armv6j_hardfp-systemd;armv7a_hardfp-systemd;arm64-systemd;i686-systemd;ppc64le-systemd;rv64_lp64d-systemd"
 )
 
 # Find latest manifest

[gentoo-commits] proj/docker-images:master commit in: /, .github/workflows/

2021-08-20 Thread Alexys Jacob 
commit: 7d477af788c1b206bd22d1268ed75e842d3fe00e
Author: Konstantinos Smanis  gmail  com>
AuthorDate: Wed Aug  4 20:35:41 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri Aug 20 18:05:13 2021 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=7d477af7

Update stage3 targets

Closes: #109

Signed-off-by: Konstantinos Smanis  gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/108
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 38 ++
 README.md   | 94 +++--
 build.sh| 16 +++-
 deploy.sh   | 71 +++---
 4 files changed, 131 insertions(+), 88 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0f7349b..a5ec941 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,30 +16,34 @@ jobs:
   matrix:
 target:
   - portage
-  - stage3-amd64
-  - stage3-amd64-hardened
-  - stage3-amd64-hardened-nomultilib
+  - stage3-amd64-hardened-nomultilib-openrc
+  - stage3-amd64-hardened-openrc
+  - stage3-amd64-musl
   - stage3-amd64-musl-hardened
-  - stage3-amd64-musl-vanilla
-  - stage3-amd64-nomultilib
+  - stage3-amd64-nomultilib-openrc
+  - stage3-amd64-nomultilib-systemd
+  - stage3-amd64-openrc
   - stage3-amd64-systemd
-  - stage3-amd64-uclibc-hardened
-  - stage3-amd64-uclibc-vanilla
-  - stage3-arm64
-  - stage3-arm64-systemd
   - stage3-armv5tel
+  - stage3-armv5tel-systemd
+  - stage3-armv6j
+  - stage3-armv6j-systemd
   - stage3-armv6j_hardfp
+  - stage3-armv6j_hardfp-systemd
+  - stage3-armv7a
+  - stage3-armv7a-systemd
   - stage3-armv7a_hardfp
-  - stage3-ppc64le
-  - stage3-ppc64le-musl-hardened
+  - stage3-armv7a_hardfp-systemd
+  - stage3-arm64
+  - stage3-arm64-systemd
+  - stage3-i686-hardened-openrc
+  - stage3-i686-musl
+  - stage3-i686-openrc
+  - stage3-i686-systemd
+  - stage3-ppc64le-musl-hardened-openrc
+  - stage3-ppc64le-openrc
   - stage3-ppc64le-systemd
   - stage3-s390x
-  - stage3-x86
-  - stage3-x86-hardened
-  - stage3-x86-musl-vanilla
-  - stage3-x86-systemd
-  - stage3-x86-uclibc-hardened
-  - stage3-x86-uclibc-vanilla
 name: ${{ matrix.target }}
 runs-on: ubuntu-latest
 env:

diff --git a/README.md b/README.md
index 651b940..b474e04 100644
--- a/README.md
+++ b/README.md
@@ -18,50 +18,86 @@ The following targets are built and pushed to Docker Hub:
  * `portage`
  * `stage3`
* `amd64`
- * `stage3-amd64`
- * `stage3-amd64-hardened`
- * `stage3-amd64-hardened-nomultilib`
+ * `stage3-amd64-hardened-nomultilib-openrc`
+ * `stage3-amd64-hardened-openrc`
+ * `stage3-amd64-musl`
  * `stage3-amd64-musl-hardened`
- * `stage3-amd64-musl-vanilla`
- * `stage3-amd64-nomultilib`
+ * `stage3-amd64-nomultilib-openrc`
+ * `stage3-amd64-nomultilib-systemd`
+ * `stage3-amd64-openrc`
  * `stage3-amd64-systemd`
- * `stage3-amd64-uclibc-hardened`
- * `stage3-amd64-uclibc-vanilla`
-   * `arm64`
- * `stage3-arm64`
- * `stage3-arm64-systemd`
* `arm`
  * `stage3-armv5tel`
+ * `stage3-armv5tel-systemd`
+ * `stage3-armv6j`
+ * `stage3-armv6j-systemd`
  * `stage3-armv6j_hardfp`
+ * `stage3-armv6j_hardfp-systemd`
+ * `stage3-armv7a`
+ * `stage3-armv7a-systemd`
  * `stage3-armv7a_hardfp`
+ * `stage3-armv7a_hardfp-systemd`
+   * `arm64`
+ * `stage3-arm64`
+ * `stage3-arm64-systemd`
* `ppc`
- * `stage3-ppc64le`
+ * `stage3-ppc64le-musl-hardened-openrc`
+ * `stage3-ppc64le-openrc`
+ * `stage3-ppc64le-systemd`
* `s390`
  * `stage3-s390x`
* `x86`
- * `stage3-x86`
- * `stage3-x86-hardened`
- * `stage3-x86-musl-vanilla`
- * `stage3-x86-systemd`
- * `stage3-x86-uclibc-hardened`
- * `stage3-x86-uclibc-vanilla`
-
-The following upstream stage3 targets are not built at all (see 
[rationale](https://github.com/gentoo/gentoo-docker-images/issues/75#issuecomment-680776939)):
+ * `stage3-i686-hardened-openrc`
+ * `stage3-i686-musl`
+ * `stage3-i686-openrc`
+ * `stage3-i686-systemd`
+
+The following upstream stage3 targets are not built at all:
  * `amd64`
-   * `stage3-amd64-hardened-selinux`
-   * `stage3-amd64-hardened-selinux+nomultilib`
-   * `stage3-x32`
+   * `stage3-amd64` [[deprecated](#deprecated)]
+   * `stage3-amd64-hardened` [[deprecated](#deprecated)]
+   * `stage3-amd64-hardened+nomultilib` [[deprecated](#deprecated)]
+   *

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /

2021-05-03 Thread Alexys Jacob 
commit: afde5561b639eab659fef11a441bf4df1a9670f3
Author: Lino Bigatti  protonmail  com>
AuthorDate: Sun May  2 12:36:05 2021 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Mon May  3 07:23:47 2021 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=afde5561

Add support for systemd and musl-hardened profiles to ppc64le.

Closes: https://github.com/gentoo/gentoo-docker-images/pull/105
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 2 ++
 deploy.sh   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ce80e8..0f7349b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,6 +31,8 @@ jobs:
   - stage3-armv6j_hardfp
   - stage3-armv7a_hardfp
   - stage3-ppc64le
+  - stage3-ppc64le-musl-hardened
+  - stage3-ppc64le-systemd
   - stage3-s390x
   - stage3-x86
   - stage3-x86-hardened

diff --git a/deploy.sh b/deploy.sh
index 8aa89a8..0a49525 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -22,10 +22,10 @@ declare -A MANIFEST_ARCHES=(

[stage3:latest]="amd64;arm64;armv5tel;armv6j_hardfp;armv7a_hardfp;ppc64le;s390x;x86"
[stage3:hardened]="amd64;x86"
[stage3:hardened-nomultilib]="amd64"
-   [stage3:musl-hardened]="amd64"
+   [stage3:musl-hardened]="amd64;ppc64le"
[stage3:musl-vanilla]="amd64;x86"
[stage3:nomultilib]="amd64"
-   [stage3:systemd]="amd64;arm64;x86"
+   [stage3:systemd]="amd64;arm64;x86;ppc64le"
[stage3:uclibc-hardened]="amd64;x86"
[stage3:uclibc-vanilla]="amd64;x86"
 )

[gentoo-commits] proj/docker-images:master commit in: .github/workflows/, /

2021-02-12 Thread Alexys Jacob 
commit: 49ead22507c20d7aceea6b4c7788bb9bceb0a0ca
Author: Konstantinos Smanis  gmail  com>
AuthorDate: Sat Dec  5 16:06:28 2020 +
Commit: Alexys Jacob  gentoo  org>
CommitDate: Fri Feb 12 17:28:42 2021 +
URL:https://gitweb.gentoo.org/proj/docker-images.git/commit/?id=49ead225

Migrate from Travis CI to GitHub Actions

Closes: #97

Signed-off-by: Konstantinos Smanis  gmail.com>
Closes: https://github.com/gentoo/gentoo-docker-images/pull/100
Signed-off-by: Alexys Jacob  gentoo.org>

 .github/workflows/build.yml | 69 +
 .travis.yml | 64 -
 README.md   |  6 ++--
 deploy.sh   |  1 -
 4 files changed, 72 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000..4ce80e8
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,69 @@
+name: build
+
+on:
+  schedule:
+- cron: '0 1 * * *'
+  push:
+  pull_request:
+
+env:
+  ORG: gentoo
+
+jobs:
+  build:
+strategy:
+  fail-fast: false
+  matrix:
+target:
+  - portage
+  - stage3-amd64
+  - stage3-amd64-hardened
+  - stage3-amd64-hardened-nomultilib
+  - stage3-amd64-musl-hardened
+  - stage3-amd64-musl-vanilla
+  - stage3-amd64-nomultilib
+  - stage3-amd64-systemd
+  - stage3-amd64-uclibc-hardened
+  - stage3-amd64-uclibc-vanilla
+  - stage3-arm64
+  - stage3-arm64-systemd
+  - stage3-armv5tel
+  - stage3-armv6j_hardfp
+  - stage3-armv7a_hardfp
+  - stage3-ppc64le
+  - stage3-s390x
+  - stage3-x86
+  - stage3-x86-hardened
+  - stage3-x86-musl-vanilla
+  - stage3-x86-systemd
+  - stage3-x86-uclibc-hardened
+  - stage3-x86-uclibc-vanilla
+name: ${{ matrix.target }}
+runs-on: ubuntu-latest
+env:
+  TARGET: ${{ matrix.target }}
+steps:
+  - name: Checkout code
+uses: actions/checkout@v2
+  - name: Set up QEMU
+uses: docker/setup-qemu-action@v1
+  - name: Set up buildx
+uses: docker/setup-buildx-action@v1
+  - name: Build image
+run: ./build.sh
+  - name: Inspect image
+run: docker image inspect "${ORG}/${TARGET/-/:}"
+  - name: Inspect portage
+if: matrix.target != 'portage'
+run: docker run --rm "${ORG}/${TARGET/-/:}" emerge --info
+  - name: Login to DockerHub
+uses: docker/login-action@v1
+if: github.event_name == 'schedule'
+with:
+  username: ${{ secrets.DOCKERHUB_USERNAME }}
+  password: ${{ secrets.DOCKERHUB_PASSWORD }}
+  - name: Push image
+if: github.event_name == 'schedule'
+env:
+  DOCKER_CLI_EXPERIMENTAL: enabled
+run: ./deploy.sh

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 754b3d7..000
--- a/.travis.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-language: shell
-env:
-  global:
-- DOCKER_CLI_EXPERIMENTAL=enabled  # required by buildx
-- ORG=gentoo
-  jobs:
-- TARGET=portage
-- TARGET=stage3-amd64
-- TARGET=stage3-amd64-hardened
-- TARGET=stage3-amd64-hardened-nomultilib
-- TARGET=stage3-amd64-musl-hardened
-- TARGET=stage3-amd64-musl-vanilla
-- TARGET=stage3-amd64-nomultilib
-- TARGET=stage3-amd64-systemd
-- TARGET=stage3-amd64-uclibc-hardened
-- TARGET=stage3-amd64-uclibc-vanilla
-- TARGET=stage3-arm64
-- TARGET=stage3-arm64-systemd
-- TARGET=stage3-armv5tel
-- TARGET=stage3-armv6j_hardfp
-- TARGET=stage3-armv7a_hardfp
-- TARGET=stage3-ppc64le
-- TARGET=stage3-s390x
-- TARGET=stage3-x86
-- TARGET=stage3-x86-hardened
-- TARGET=stage3-x86-musl-vanilla
-- TARGET=stage3-x86-systemd
-- TARGET=stage3-x86-uclibc-hardened
-- TARGET=stage3-x86-uclibc-vanilla
-
-before_install:
-  # Install latest Docker (>=19.03.0 required by buildx)
-  # https://docs.travis-ci.com/user/docker/#installing-a-newer-docker-version
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add 
-
-  - sudo add-apt-repository "deb [arch=amd64] 
https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update -qq
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
-  - docker info
-before_script:
-  # Create multiarch buildx builder
-  - docker buildx create --driver docker-container --use
-script:
-  # Build image
-  - ./build.sh
-after_success:
-  # Inspect built image
-  - docker image inspect "${ORG}/${TARGET/-/:}"
-  # Run `emerge --info` for stage builds
-  - |
-if [[ "${TARGET}" == stage* ]]; then
-  # Check if QEMU emulation support is required
-  if [[ ! "${TARGET}" =~ -(amd64|x86)($|-) ]]; then
-# Enable execution of foreign binary formats (i.e.,