From ea3184e61e50e54c7af9a28d00aae239627caa22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 16:33:36 +0100 Subject: [PATCH 1/9] install ansible in venv --- Dockerfile.bootstrap-prefix-debian11 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile.bootstrap-prefix-debian11 b/Dockerfile.bootstrap-prefix-debian11 index 6c564328..fca32c0f 100644 --- a/Dockerfile.bootstrap-prefix-debian11 +++ b/Dockerfile.bootstrap-prefix-debian11 @@ -4,9 +4,13 @@ COPY bootstrap-prefix.sh /usr/local/bin/bootstrap-prefix.sh RUN apt-get update RUN apt-get install -y gcc g++ make diffutils libgmp-dev perl wget -RUN apt-get install -y git python3-pip python3-cryptography -RUN pip3 install --upgrade pip -RUN pip3 install ansible +RUN apt-get install -y git python3-pip python3-cryptography python3-venv +RUN python3 -m venv --system-site-packages /opt/ansible && \ + . /opt/ansible/bin/activate && \ + pip3 install --upgrade pip && \ + pip3 install ansible && \ + ln -s /opt/ansible/bin/ansible* /usr/local/bin/ && \ + deactivate RUN chmod 755 /usr/local/bin/bootstrap-prefix.sh ENV LC_ALL=C.UTF-8 From 80e57f576227329f56764c666bd0e1ab6f466990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:27:59 +0100 Subject: [PATCH 2/9] add debian sid container --- Dockerfile.bootstrap-prefix-debian-sid | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Dockerfile.bootstrap-prefix-debian-sid diff --git a/Dockerfile.bootstrap-prefix-debian-sid b/Dockerfile.bootstrap-prefix-debian-sid new file mode 100644 index 00000000..2a9e70ff --- /dev/null +++ b/Dockerfile.bootstrap-prefix-debian-sid @@ -0,0 +1,22 @@ +# Should move to Trixie whenever riscv64 images are available +FROM debian:sid-20240211-slim + +COPY bootstrap-prefix.sh /usr/local/bin/bootstrap-prefix.sh + +RUN apt-get update +RUN apt-get install -y gcc g++ make diffutils libgmp-dev perl wget +RUN apt-get install -y git python3-pip python3-cryptography python3-venv +RUN python3 -m venv --system-site-packages /opt/ansible && \ + . /opt/ansible/bin/activate && \ + pip3 install --upgrade pip && \ + pip3 install ansible && \ + ln -s /opt/ansible/bin/ansible* /usr/local/bin/ && \ + deactivate +RUN chmod 755 /usr/local/bin/bootstrap-prefix.sh + +ENV LC_ALL=C.UTF-8 +ENV PATH=/usr/local/bin:$PATH + +RUN groupadd -g 1000 portage && useradd -ms /bin/bash -u 1000 -g portage portage + +ENTRYPOINT ["/usr/local/bin/bootstrap-prefix.sh"] From c22775fe20df46ba24a276005be52dcf34c1d046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:28:13 +0100 Subject: [PATCH 3/9] rename Dockerfile --- Dockerfile.bootstrap-prefix-debian-11 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Dockerfile.bootstrap-prefix-debian-11 diff --git a/Dockerfile.bootstrap-prefix-debian-11 b/Dockerfile.bootstrap-prefix-debian-11 new file mode 100644 index 00000000..fca32c0f --- /dev/null +++ b/Dockerfile.bootstrap-prefix-debian-11 @@ -0,0 +1,21 @@ +FROM debian:11-slim + +COPY bootstrap-prefix.sh /usr/local/bin/bootstrap-prefix.sh + +RUN apt-get update +RUN apt-get install -y gcc g++ make diffutils libgmp-dev perl wget +RUN apt-get install -y git python3-pip python3-cryptography python3-venv +RUN python3 -m venv --system-site-packages /opt/ansible && \ + . /opt/ansible/bin/activate && \ + pip3 install --upgrade pip && \ + pip3 install ansible && \ + ln -s /opt/ansible/bin/ansible* /usr/local/bin/ && \ + deactivate +RUN chmod 755 /usr/local/bin/bootstrap-prefix.sh + +ENV LC_ALL=C.UTF-8 +ENV PATH=/usr/local/bin:$PATH + +RUN groupadd -g 1000 portage && useradd -ms /bin/bash -u 1000 -g portage portage + +ENTRYPOINT ["/usr/local/bin/bootstrap-prefix.sh"] From c766bd89f1d06040f30f42fdc10007063f2877f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:28:46 +0100 Subject: [PATCH 4/9] trigger CI for all Dockerfiles --- .github/workflows/build-and-publish-bootstrap-container.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-publish-bootstrap-container.yml b/.github/workflows/build-and-publish-bootstrap-container.yml index ba7ef495..95506343 100644 --- a/.github/workflows/build-and-publish-bootstrap-container.yml +++ b/.github/workflows/build-and-publish-bootstrap-container.yml @@ -4,14 +4,14 @@ on: branches: - main paths: - - Dockerfile.bootstrap-prefix-debian11 + - Dockerfile.bootstrap-prefix* - bootstrap-prefix.sh pull_request: branches: - main paths: - - Dockerfile.bootstrap-prefix-debian11 + - Dockerfile.bootstrap-prefix* - bootstrap-prefix.sh # Declare default permissions as read only. From 95db2d4d7fbe6f255440fc98db7d0925ba4cae43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:29:16 +0100 Subject: [PATCH 5/9] rename Dockerfile --- .github/workflows/build-and-publish-bootstrap-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish-bootstrap-container.yml b/.github/workflows/build-and-publish-bootstrap-container.yml index 95506343..95410ce4 100644 --- a/.github/workflows/build-and-publish-bootstrap-container.yml +++ b/.github/workflows/build-and-publish-bootstrap-container.yml @@ -48,7 +48,7 @@ jobs: - name: Build and push to GitHub Packages uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 #v3.2.0 with: - tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/bootstrap-prefix:debian11 + tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/bootstrap-prefix:debian-11 file: Dockerfile.bootstrap-prefix-debian11 platforms: linux/amd64, linux/arm64, linux/ppc64le push: ${{ github.event_name != 'pull_request' }} From bd24e1476fd0c7087be6b9e88f5a4e665ca4344c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:29:29 +0100 Subject: [PATCH 6/9] remove ppc64le support --- .github/workflows/build-and-publish-bootstrap-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish-bootstrap-container.yml b/.github/workflows/build-and-publish-bootstrap-container.yml index 95410ce4..3e71181d 100644 --- a/.github/workflows/build-and-publish-bootstrap-container.yml +++ b/.github/workflows/build-and-publish-bootstrap-container.yml @@ -50,5 +50,5 @@ jobs: with: tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/bootstrap-prefix:debian-11 file: Dockerfile.bootstrap-prefix-debian11 - platforms: linux/amd64, linux/arm64, linux/ppc64le + platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} From ae57fd4562d9cc519f5d1cd3dc086911455215b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:30:17 +0100 Subject: [PATCH 7/9] also build Debian Sid image, also for riscv64 --- .../workflows/build-and-publish-bootstrap-container.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build-and-publish-bootstrap-container.yml b/.github/workflows/build-and-publish-bootstrap-container.yml index 3e71181d..dc80246b 100644 --- a/.github/workflows/build-and-publish-bootstrap-container.yml +++ b/.github/workflows/build-and-publish-bootstrap-container.yml @@ -52,3 +52,11 @@ jobs: file: Dockerfile.bootstrap-prefix-debian11 platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} + + - name: Build and push to GitHub Packages + uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 #v3.2.0 + with: + tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/bootstrap-prefix:debian-sid + file: Dockerfile.bootstrap-prefix-debian-sid + platforms: linux/amd64, linux/arm64, linux/riscv64 + push: ${{ github.event_name != 'pull_request' }} From 40f6091ddac129fc7c3d09a5aa198793d41552b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:30:38 +0100 Subject: [PATCH 8/9] rename Dockerfile --- .github/workflows/build-and-publish-bootstrap-container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish-bootstrap-container.yml b/.github/workflows/build-and-publish-bootstrap-container.yml index dc80246b..3451fe15 100644 --- a/.github/workflows/build-and-publish-bootstrap-container.yml +++ b/.github/workflows/build-and-publish-bootstrap-container.yml @@ -49,7 +49,7 @@ jobs: uses: docker/build-push-action@c56af957549030174b10d6867f20e78cfd7debc5 #v3.2.0 with: tags: ghcr.io/${{ env.REPOSITORY_OWNER }}/bootstrap-prefix:debian-11 - file: Dockerfile.bootstrap-prefix-debian11 + file: Dockerfile.bootstrap-prefix-debian-11 platforms: linux/amd64, linux/arm64 push: ${{ github.event_name != 'pull_request' }} From 06f5954585c71d2e5ec6cab4c1cc3f926c874428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 5 Mar 2024 17:31:01 +0100 Subject: [PATCH 9/9] rename file --- Dockerfile.bootstrap-prefix-debian11 | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Dockerfile.bootstrap-prefix-debian11 diff --git a/Dockerfile.bootstrap-prefix-debian11 b/Dockerfile.bootstrap-prefix-debian11 deleted file mode 100644 index fca32c0f..00000000 --- a/Dockerfile.bootstrap-prefix-debian11 +++ /dev/null @@ -1,21 +0,0 @@ -FROM debian:11-slim - -COPY bootstrap-prefix.sh /usr/local/bin/bootstrap-prefix.sh - -RUN apt-get update -RUN apt-get install -y gcc g++ make diffutils libgmp-dev perl wget -RUN apt-get install -y git python3-pip python3-cryptography python3-venv -RUN python3 -m venv --system-site-packages /opt/ansible && \ - . /opt/ansible/bin/activate && \ - pip3 install --upgrade pip && \ - pip3 install ansible && \ - ln -s /opt/ansible/bin/ansible* /usr/local/bin/ && \ - deactivate -RUN chmod 755 /usr/local/bin/bootstrap-prefix.sh - -ENV LC_ALL=C.UTF-8 -ENV PATH=/usr/local/bin:$PATH - -RUN groupadd -g 1000 portage && useradd -ms /bin/bash -u 1000 -g portage portage - -ENTRYPOINT ["/usr/local/bin/bootstrap-prefix.sh"]