chore: update base image to UBI9 (#40)

Signed-off-by: Niccolò Fei <[email protected]>
EnterpriseDB · Jul 29, 2024 · bda3856 · bda3856
1 parent c40f842
commit bda3856
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
@@ -83,7 +83,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           secrets: |
-            "cs_script=${{ secrets.CS_SCRIPT }}"
+            "cs_token=${{ secrets.CLOUDSMITH_READ_ALL }}"
           platforms: ${{ env.PLATFORMS }}
           context: .
           push: true

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -37,10 +37,10 @@ jobs:
       -
         name: Get latest UBI
         run: |
-          UBI_VERSION=$(skopeo list-tags docker://registry.access.redhat.com/ubi8-minimal | jq -r '.Tags[]' | grep -vE "(latest|source|.att|.sig)" | sort -Vr | head -n1)
+          UBI_VERSION=$(skopeo list-tags docker://registry.access.redhat.com/ubi9-minimal | jq -r '.Tags[]' | grep -vE "(latest|source|.att|.sig)" | sort -Vr | head -n1)
           if [ -z "$UBI_VERSION" ]
           then
-            echo "UBI8 minimal latest tag could not be retrieved"
+            echo "UBI9 minimal latest tag could not be retrieved"
             exit 0
           fi
           echo "UBI_VERSION=$UBI_VERSION" >> $GITHUB_ENV
@@ -89,7 +89,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           secrets: |
-            "cs_script=${{ secrets.CS_SCRIPT }}"
+            "cs_token=${{ secrets.CLOUDSMITH_READ_ALL }}"
           context: .
           load: true
           push: false

diff --git a/Dockerfile.template b/Dockerfile.template
@@ -2,12 +2,12 @@
 ARG UBI_VERSION=%%UBI_VERSION%%
 ARG PGBOUNCER_VERSION=%%PGBOUNCER_VERSION%%
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:${UBI_VERSION} AS build
+FROM registry.access.redhat.com/ubi9/ubi-minimal:${UBI_VERSION} AS build
 ARG PGBOUNCER_VERSION
 
 # Install build dependencies. EPEL repository is required by udns
 RUN set -xe ; \
-        rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ; \
+        rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm ; \
         microdnf -y install make libevent libevent-devel pkg-config openssl openssl-devel \
             tar gzip gcc udns udns-devel ; \
         microdnf -y clean all --enablerepo='*' ; \
@@ -17,7 +17,7 @@ RUN set -xe ; \
         ./configure --without-cares --with-udns ; \
         make
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:${UBI_VERSION}
+FROM registry.access.redhat.com/ubi9/ubi-minimal:${UBI_VERSION}
 ARG PGBOUNCER_VERSION
 ARG TARGETARCH
 
@@ -27,29 +27,29 @@ LABEL name="PgBouncer Container Images" \
       version="%%PGBOUNCER_VERSION%%" \
       release="%%IMAGE_RELEASE_VERSION%%" \
       summary="Container images for PgBouncer (connection pooler for PostgreSQL)." \
-      description="This Docker image contains PgBouncer based on RedHat Universal Base Images (UBI) 8 minimal."
+      description="This Docker image contains PgBouncer based on RedHat Universal Base Images (UBI) 9 minimal."
 
 COPY root/ /
 
-RUN --mount=type=secret,id=cs_script,target=/run/secrets/cs_script.sh \
+RUN --mount=type=secret,id=cs_token \
         set -xe ; \
-        rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm ; \
+        rpm -i https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm ; \
         ARCH="${TARGETARCH}" ; \
         base_url="https://download.postgresql.org/pub/repos/yum/reporpms" ; \
         case $ARCH in \
             amd64) \
-                rpm -i "${base_url}/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ;; \
+                rpm -i "${base_url}/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm" ;; \
             arm64) \
-                rpm -i "${base_url}/EL-8-aarch64/pgdg-redhat-repo-latest.noarch.rpm" ;; \
+                rpm -i "${base_url}/EL-9-aarch64/pgdg-redhat-repo-latest.noarch.rpm" ;; \
             ppc64le) \
-                rpm -i "${base_url}/EL-8-ppc64le/pgdg-redhat-repo-latest.noarch.rpm" ;; \
+                curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/enterprise/setup.rpm.sh | bash ;; \
             s390x) \
-                bash /run/secrets/cs_script.sh ;; \
+                curl -u token:$(cat /run/secrets/cs_token) -1sLf https://downloads.enterprisedb.com/basic/edb/setup.rpm.sh | bash ;; \
             *) \
                 exit 1 ;; \
         esac ; \
         microdnf -y install libevent openssl udns shadow-utils findutils ; \
-        microdnf -y install --setopt=install_weak_deps=0 --setopt=tsflags=nodocs --nodocs --noplugins postgresql13 ; \
+        microdnf -y install --setopt=install_weak_deps=0 --setopt=tsflags=nodocs --nodocs --noplugins postgresql16 ; \
         microdnf -y clean all --enablerepo='*' ; \
         rm -fr /etc/yum.repos.d/enterprisedb-edb.repo ; \
         rm -fr /tmp/* ; \

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # PgBouncer Container Images by EnterpriseDB
 
 Maintenance scripts to generate Immutable Application Containers for PgBouncer,
-based on UBI 8 minimal.
+based on UBI 9 minimal.
 
 These images are customised to work with
 [Cloud Native PostgreSQL operators by EDB](https://docs.enterprisedb.io/cloud-native-postgresql/)