From 428c2bdd6144b11bb5fcefad954f2d33ae697f64 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Mon, 4 Nov 2024 09:19:51 -0500 Subject: [PATCH] container-images: bump fedora images to fedora:40 39 is starting to be old with 41 just recently released. We will eventually update to 41, let's just bump a single release for now. --- contrib/container-images/README.rst | 6 +++--- contrib/container-images/fedora-distribution.sh | 4 ++-- contrib/container-images/fedora-pypi.sh | 4 ++-- contrib/container-images/fedora-source.sh | 4 ++-- tests/with_container_images.yaml | 6 +++--- tests/zuul_publish_container_images.yaml | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/container-images/README.rst b/contrib/container-images/README.rst index aba7cab0..c08d4491 100644 --- a/contrib/container-images/README.rst +++ b/contrib/container-images/README.rst @@ -27,9 +27,9 @@ You will need to install `buildah `_ -- fedora-pypi.sh_: Builds an image from `PyPi `_ packages on Fedora 39 -- fedora-source.sh_: Builds an image from `git source `_ on Fedora 39 +- fedora-distribution.sh_: Builds an image from Fedora 40 `distribution packages `_ +- fedora-pypi.sh_: Builds an image from `PyPi `_ packages on Fedora 40 +- fedora-source.sh_: Builds an image from `git source `_ on Fedora 40 - centos-pypi.sh_: Builds an image from `PyPi `_ packages on CentOS 9 Stream - centos-source.sh_: Builds an image from `git source `_ on CentOS 9 Stream diff --git a/contrib/container-images/fedora-distribution.sh b/contrib/container-images/fedora-distribution.sh index d8c7c4d1..485b8231 100755 --- a/contrib/container-images/fedora-distribution.sh +++ b/contrib/container-images/fedora-distribution.sh @@ -2,8 +2,8 @@ # Copyright (c) 2023 The ARA Records Ansible authors # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) -# Builds an ARA API server container image from Fedora 39 distribution packages. -build=$(buildah from quay.io/fedora/fedora:39) +# Builds an ARA API server container image from Fedora 40 distribution packages. +build=$(buildah from quay.io/fedora/fedora:40) # Get all updates, install the ARA API server, database backends and gunicorn application server # This lets users swap easily from the sqlite default to mysql or postgresql just by tweaking settings.yaml. diff --git a/contrib/container-images/fedora-pypi.sh b/contrib/container-images/fedora-pypi.sh index 6f2c8a97..931ad6a5 100755 --- a/contrib/container-images/fedora-pypi.sh +++ b/contrib/container-images/fedora-pypi.sh @@ -3,8 +3,8 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DEV_DEPENDENCIES="gcc python3-devel postgresql-devel mariadb-devel" -# Builds an ARA API server container image using the latest PyPi packages on Fedora 39. -build=$(buildah from quay.io/fedora/fedora:39) +# Builds an ARA API server container image using the latest PyPi packages on Fedora 40. +build=$(buildah from quay.io/fedora/fedora:40) # Ensure everything is up to date and install requirements buildah run "${build}" -- /bin/bash -c "dnf update -y && dnf install -y which python3-pip python3-wheel postgresql libpq mariadb-connector-c" diff --git a/contrib/container-images/fedora-source.sh b/contrib/container-images/fedora-source.sh index e6b8cc08..df7ea010 100755 --- a/contrib/container-images/fedora-source.sh +++ b/contrib/container-images/fedora-source.sh @@ -3,7 +3,7 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) DEV_DEPENDENCIES="gcc python3-devel postgresql-devel mariadb-devel" -# Builds an ARA API server container image from checked out source on Fedora 39. +# Builds an ARA API server container image from checked out source on Fedora 40. # Figure out source directory relative to the contrib/container-images directory SCRIPT_DIR=$(cd `dirname $0` && pwd -P) SOURCE_DIR=$(cd "${SCRIPT_DIR}/../.." && pwd -P) @@ -14,7 +14,7 @@ python3 setup.py sdist sdist=$(ls dist/ara-*.tar.gz) popd -build=$(buildah from quay.io/fedora/fedora:39) +build=$(buildah from quay.io/fedora/fedora:40) # Ensure everything is up to date and install requirements buildah run "${build}" -- /bin/bash -c "dnf update -y && dnf install -y which python3-pip python3-wheel postgresql libpq mariadb-connector-c" diff --git a/tests/with_container_images.yaml b/tests/with_container_images.yaml index cac2ddbe..304fb6df 100644 --- a/tests/with_container_images.yaml +++ b/tests/with_container_images.yaml @@ -13,19 +13,19 @@ images: # These are in chronological order of release so that we don't end up # running SQL migrations backwards during the tests. - - tag: fedora39-source-latest + - tag: fedora40-source-latest script: fedora-source.sh name: localhost/ara-api - tag: centos9-source-latest script: centos-source.sh name: localhost/ara-api - - tag: fedora39-pypi-latest + - tag: fedora40-pypi-latest script: fedora-pypi.sh name: localhost/ara-api - tag: centos9-pypi-latest script: centos-pypi.sh name: localhost/ara-api - - tag: fedora39-distribution-latest + - tag: fedora40-distribution-latest script: fedora-distribution.sh name: localhost/ara-api tasks: diff --git a/tests/zuul_publish_container_images.yaml b/tests/zuul_publish_container_images.yaml index 3ecc34d2..03347f04 100644 --- a/tests/zuul_publish_container_images.yaml +++ b/tests/zuul_publish_container_images.yaml @@ -8,15 +8,15 @@ destination: "{{ destination_repository | default('docker.io/recordsansible/ara-api') }}" images: # These images are meant to be provided by the "with_container_images.yaml" playbook - - tag: fedora39-source-latest + - tag: fedora40-source-latest name: localhost/ara-api - tag: centos9-source-latest name: localhost/ara-api - - tag: fedora39-pypi-latest + - tag: fedora40-pypi-latest name: localhost/ara-api - tag: centos9-pypi-latest name: localhost/ara-api - - tag: fedora39-distribution-latest + - tag: fedora40-distribution-latest name: localhost/ara-api tasks: - name: List built container images @@ -28,9 +28,9 @@ buildah tag {{ item.name }}:{{ item.tag }} {{ destination }}:{{ item.tag }} loop: "{{ images }}" - - name: Tag latest from fedora39-pypi-latest + - name: Tag latest from fedora40-pypi-latest command: | - buildah tag {{ destination }}:fedora39-pypi-latest {{ destination }}:latest + buildah tag {{ destination }}:fedora40-pypi-latest {{ destination }}:latest - name: Push latest command: |