From 2122805b5cfe3135ca53d42f706a0897e9901554 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 16 Jan 2024 19:03:08 +0100 Subject: [PATCH] Withdraw the Red Hat Enterprise Linux images Toolbx now offers built-in support for Red Hat Enterprise Linux. These images are maintained by Red Hat and their sources are part of the Toolbx project. https://github.com/toolbx-images/images/issues/118 --- .github/workflows/rhel.yaml | 123 ------------------------------------ README.md | 34 +++------- rhel/7/Containerfile | 21 ------ rhel/7/extra-packages | 33 ---------- rhel/7/missing-docs | 15 ----- rhel/8.2/Containerfile | 22 ------- rhel/8.2/extra-packages | 33 ---------- rhel/8.2/missing-docs | 15 ----- rhel/8.4/Containerfile | 22 ------- rhel/8.4/extra-packages | 33 ---------- rhel/8.4/missing-docs | 15 ----- rhel/8.6/Containerfile | 22 ------- rhel/8.6/extra-packages | 33 ---------- rhel/8.6/missing-docs | 15 ----- rhel/8.8/Containerfile | 22 ------- rhel/8.8/extra-packages | 33 ---------- rhel/8.8/missing-docs | 15 ----- rhel/9.0/Containerfile | 22 ------- rhel/9.0/extra-packages | 32 ---------- rhel/9.0/missing-docs | 15 ----- rhel/9.2/Containerfile | 22 ------- rhel/9.2/extra-packages | 32 ---------- rhel/9.2/missing-docs | 15 ----- rhel/9.3/Containerfile | 22 ------- rhel/9.3/extra-packages | 32 ---------- rhel/9.3/missing-docs | 15 ----- 26 files changed, 9 insertions(+), 704 deletions(-) delete mode 100644 .github/workflows/rhel.yaml delete mode 100644 rhel/7/Containerfile delete mode 100644 rhel/7/extra-packages delete mode 100644 rhel/7/missing-docs delete mode 100644 rhel/8.2/Containerfile delete mode 100644 rhel/8.2/extra-packages delete mode 100644 rhel/8.2/missing-docs delete mode 100644 rhel/8.4/Containerfile delete mode 100644 rhel/8.4/extra-packages delete mode 100644 rhel/8.4/missing-docs delete mode 100644 rhel/8.6/Containerfile delete mode 100644 rhel/8.6/extra-packages delete mode 100644 rhel/8.6/missing-docs delete mode 100644 rhel/8.8/Containerfile delete mode 100644 rhel/8.8/extra-packages delete mode 100644 rhel/8.8/missing-docs delete mode 100644 rhel/9.0/Containerfile delete mode 100644 rhel/9.0/extra-packages delete mode 100644 rhel/9.0/missing-docs delete mode 100644 rhel/9.2/Containerfile delete mode 100644 rhel/9.2/extra-packages delete mode 100644 rhel/9.2/missing-docs delete mode 100644 rhel/9.3/Containerfile delete mode 100644 rhel/9.3/extra-packages delete mode 100644 rhel/9.3/missing-docs diff --git a/.github/workflows/rhel.yaml b/.github/workflows/rhel.yaml deleted file mode 100644 index 95feddf7..00000000 --- a/.github/workflows/rhel.yaml +++ /dev/null @@ -1,123 +0,0 @@ -name: "RHEL: Build and push toolbx images" - -permissions: read-all - -on: - pull_request: - branches: - - main - paths: - - rhel/** - - .github/workflows/rhel.yaml - push: - branches: - - main - paths: - - rhel/** - - .github/workflows/rhel.yaml - schedule: - - cron: '0 0 * * MON' - -env: - distro: 'rhel' - distro_pretty: 'RHEL' - latest_release: '9.2' - platforms: 'linux/amd64, linux/arm64' - registry: 'quay.io/toolbx-images' - -# Prevent multiple workflow runs from racing to ensure that pushes are made -# sequentialy for the main branch. Also cancel in progress workflow runs for -# pull requests only. -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.event_name == 'pull_request' }} - -jobs: - build-push-images: - strategy: - matrix: - release: ['8.2', '8.4', '8.6', '8.8', '9.0', '9.2', '9.3'] - - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU for multi-arch builds - shell: bash - run: | - sudo apt update - sudo apt install qemu-user-static - - - name: Build container image - uses: redhat-actions/buildah-build@v2 - if: env.latest_release != matrix.release - with: - platforms: ${{ env.platforms }} - context: ${{ env.distro }}/${{ matrix.release }} - image: ${{ env.distro }}-toolbox - tags: ${{ matrix.release }} - containerfiles: ${{ env.distro }}/${{ matrix.release }}/Containerfile - layers: false - oci: true - - - name: Build container image (latest tag) - uses: redhat-actions/buildah-build@v2 - if: env.latest_release == matrix.release - with: - platforms: ${{ env.platforms }} - context: ${{ env.distro }}/${{ matrix.release }} - image: ${{ env.distro }}-toolbox - tags: ${{ matrix.release }} latest - containerfiles: ${{ env.distro }}/${{ matrix.release }}/Containerfile - layers: false - oci: true - - - name: Push to Container Registry - uses: redhat-actions/push-to-registry@v2 - id: push - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release != matrix.release - with: - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_SECRET }} - image: ${{ env.distro }}-toolbox - registry: ${{ env.registry }} - tags: ${{ matrix.release }} - - - name: Push to Container Registry (latest tag) - uses: redhat-actions/push-to-registry@v2 - id: push-latest - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release == matrix.release - with: - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_SECRET }} - image: ${{ env.distro }}-toolbox - registry: ${{ env.registry }} - tags: ${{ matrix.release }} latest - - - name: Login to Container Registry - uses: redhat-actions/podman-login@v1 - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' - with: - registry: ${{ env.registry }} - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_SECRET }} - - - uses: sigstore/cosign-installer@v3.3.0 - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' - - - name: Sign container image - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release != matrix.release - run: | - cosign sign -y --recursive --key env://COSIGN_PRIVATE_KEY ${{ env.registry }}/${{ env.distro }}-toolbox@${{ steps.push.outputs.digest }} - env: - COSIGN_EXPERIMENTAL: false - COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} - - - name: Sign container image (latest) - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release == matrix.release - run: | - cosign sign -y --recursive --key env://COSIGN_PRIVATE_KEY ${{ env.registry }}/${{ env.distro }}-toolbox@${{ steps.push-latest.outputs.digest }} - env: - COSIGN_EXPERIMENTAL: false - COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} diff --git a/README.md b/README.md index 9145b33d..3ba92788 100644 --- a/README.md +++ b/README.md @@ -99,33 +99,17 @@ directly use the commands below: $ toolbox enter opensuse-toolbox-tumbleweed ``` -- [Red Hat Enterprise Linux (Universal Base Image)] with [EPEL] enabled by - default. Note: You are free to use and redistribute UBI images, provided you - adhere to the [Red Hat Universal Base Image End User Licensing Agreement]. +- [Red Hat Enterprise Linux (Universal Base Image)]: The images are now + maintained by Red Hat and their sources are part of [Toolbx] ([GitHub]) (repo + on `registry.access.redhat.com` for RHEL [8](https://catalog.redhat.com/software/containers/ubi8/toolbox/611bd665bd674341b5c5ed46) + and [9](https://catalog.redhat.com/software/containers/ubi9/toolbox/61532d7dd2c7f84a4d2ed86b)). + Usage: ``` - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:9.2 - $ toolbox enter rhel-toolbox-9.2 + $ toolbox create --distro rhel --release 9.3 + $ toolbox enter rhel-toolbox-9.3 - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:9.1 - $ toolbox enter rhel-toolbox-9.1 - - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:9.0 - $ toolbox enter rhel-toolbox-9.0 - - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:8.8 - $ toolbox enter rhel-toolbox-8.8 - - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:8.7 - $ toolbox enter rhel-toolbox-8.7 - - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:8.6 - $ toolbox enter rhel-toolbox-8.6 - - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:8.4 - $ toolbox enter rhel-toolbox-8.4 - - $ toolbox create --image quay.io/toolbx-images/rhel-toolbox:8.2 - $ toolbox enter rhel-toolbox-8.2 + $ toolbox create --distro rhel --release 8.9 + $ toolbox enter rhel-toolbox-8.9 ``` - [Rocky Linux] with [EPEL] enabled by default: diff --git a/rhel/7/Containerfile b/rhel/7/Containerfile deleted file mode 100644 index 7f824b78..00000000 --- a/rhel/7/Containerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM registry.access.redhat.com/ubi7/ubi - -LABEL com.github.containers.toolbox="true" \ - com.redhat.component="rhel-toolbox" \ - name="rhel-toolbox" \ - version="7" \ - usage="This image is meant to be used with the toolbox command" \ - summary="Base image for creating RHEL toolbox containers" \ - maintainer="Timothée Ravier " - -RUN sed -i '/tsflags=nodocs/d' /etc/yum.conf - -COPY missing-docs extra-packages / - -RUN yum -y reinstall $(