From 931a948bfe9db6e26eb64ffba09d889bef860b6c Mon Sep 17 00:00:00 2001 From: Nicola Date: Mon, 2 Dec 2024 19:00:48 +0100 Subject: [PATCH] deprecate old images --- .github/workflows/publish-centos.yml | 50 ------------------- .github/workflows/tests.yml | 14 +----- deprecated/README.md | 2 +- .../centos7}/python3.6/Dockerfile | 0 .../centos7}/python3.9/Dockerfile | 0 5 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 .github/workflows/publish-centos.yml rename {centos7 => deprecated/centos7}/python3.6/Dockerfile (100%) rename {centos7 => deprecated/centos7}/python3.9/Dockerfile (100%) diff --git a/.github/workflows/publish-centos.yml b/.github/workflows/publish-centos.yml deleted file mode 100644 index 8bc3c98..0000000 --- a/.github/workflows/publish-centos.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: Publish CentOS - -on: - schedule: - - cron: "0 2 * * 2" # at 02:00 on Tuesday - workflow_dispatch: - inputs: - reason: - description: 'Reason' - required: false - default: 'Manual trigger' - -jobs: - - # CentOS 7 is kept, with one tag only, because previously used in Invenio. - centos7: - name: Publish CentOS - runs-on: ubuntu-latest - - strategy: - matrix: - include: - - name: CentOS 7 Python 3.6 - context: ./centos7/python3.6/ - file: ./centos7/python3.6/Dockerfile - tag: 3.6 - - - name: CentOS 7 Python 3.9 - context: ./centos7/python3.9/ - file: ./centos7/python3.9/Dockerfile - tag: 3.9 - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Log in to CERN registry - uses: docker/login-action@v2 - with: - registry: registry.cern.ch - username: ${{ secrets.CERN_REGISTRY_USERNAME }} - password: ${{ secrets.CERN_REGISTRY_PASSWORD }} - - - name: Publish ${{ matrix.name }} - uses: docker/build-push-action@v3 - with: - context: ${{ matrix.context }} - file: ${{ matrix.file }} - push: true - tags: registry.cern.ch/${{ github.repository_owner }}/centos7-python:${{ matrix.tag }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 70592da..1815f9c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,25 +25,15 @@ on: jobs: Tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest continue-on-error: ${{ matrix.experimental }} strategy: matrix: include: - - image-name: centos7:3.6 - python-version: 3.6 - cmd-args: -t inveniosoftware/centos7:3.6 ./centos7/python3.6/ --build-arg CENTOS_VERSION=7 - experimental: false - - - image-name: centos7:3.9 - python-version: 3.9 - cmd-args: -t inveniosoftware/centos7:3.9 ./centos7/python3.9/ --build-arg CENTOS_VERSION=7 - experimental: false - - image-name: almalinux python-version: 3.9 cmd-args: -t inveniosoftware/almalinux ./almalinux/ --build-arg LINUX_VERSION=9 --build-arg BUILDPLATFORM=linux/amd64 - experimental: true + experimental: false steps: - name: Checkout diff --git a/deprecated/README.md b/deprecated/README.md index 14ba244..6891816 100644 --- a/deprecated/README.md +++ b/deprecated/README.md @@ -1,3 +1,3 @@ ### Deprecated -These images based on CentOS 8 are deprecated. CentOS 8 has reached [end of life](https://www.centos.org/centos-linux-eol/). +These images based on CentOS 7/8 are deprecated. CentOS 7/8 have reached [end of life](https://www.centos.org/centos-linux-eol/). diff --git a/centos7/python3.6/Dockerfile b/deprecated/centos7/python3.6/Dockerfile similarity index 100% rename from centos7/python3.6/Dockerfile rename to deprecated/centos7/python3.6/Dockerfile diff --git a/centos7/python3.9/Dockerfile b/deprecated/centos7/python3.9/Dockerfile similarity index 100% rename from centos7/python3.9/Dockerfile rename to deprecated/centos7/python3.9/Dockerfile