From e98d0d2f49c779244f8ee8c8f2cf0a4a32be2c17 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Wed, 22 May 2024 09:28:48 +0200 Subject: [PATCH] deprecate c8s images, as EOL for c8s is 31th of May 2024 --- .github/workflows/build-and-push.yml | 42 +++---------- .github/workflows/container-tests.yml | 6 +- 10/Dockerfile.c8s | 89 -------------------------- 12/Dockerfile.c8s | 90 --------------------------- 13/Dockerfile.c8s | 90 --------------------------- 15/Dockerfile.c8s | 90 --------------------------- 16/Dockerfile.c8s | 90 --------------------------- imagestreams/imagestreams.yaml | 3 - imagestreams/postgresql-centos.json | 72 --------------------- manifest.yml | 3 - specs/multispec.yml | 63 ++++++++----------- src/Dockerfile | 4 +- 12 files changed, 37 insertions(+), 605 deletions(-) delete mode 100644 10/Dockerfile.c8s delete mode 100644 12/Dockerfile.c8s delete mode 100644 13/Dockerfile.c8s delete mode 100644 15/Dockerfile.c8s delete mode 100644 16/Dockerfile.c8s diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 21da1781..37cf19f3 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -21,6 +21,7 @@ jobs: quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" docker_context: 13 + - dockerfile: "15/Dockerfile.c9s" registry_namespace: "sclorg" tag: "c9s" @@ -28,6 +29,7 @@ jobs: quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" docker_context: 15 + - dockerfile: "16/Dockerfile.c9s" registry_namespace: "sclorg" tag: "c9s" @@ -35,41 +37,7 @@ jobs: quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" docker_context: 16 - - dockerfile: "16/Dockerfile.c8s" - registry_namespace: "sclorg" - tag: "c8s" - image_name: "postgresql-16-c8s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - docker_context: 16 - - dockerfile: "10/Dockerfile.c8s" - registry_namespace: "sclorg" - tag: "c8s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - image_name: "postgresql-10-c8s" - docker_context: 10 - - dockerfile: "12/Dockerfile.c8s" - registry_namespace: "sclorg" - tag: "c8s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - image_name: "postgresql-12-c8s" - docker_context: 12 - - dockerfile: "13/Dockerfile.c8s" - registry_namespace: "sclorg" - tag: "c8s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - image_name: "postgresql-13-c8s" - docker_context: 13 - - dockerfile: "15/Dockerfile.c8s" - registry_namespace: "sclorg" - tag: "c8s" - quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME" - quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN" - image_name: "postgresql-15-c8s" - docker_context: 15 + - dockerfile: "12/Dockerfile.fedora" registry_namespace: "fedora" tag: "12" @@ -77,6 +45,7 @@ jobs: quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" image_name: "postgresql-12" docker_context: 12 + - dockerfile: "13/Dockerfile.fedora" registry_namespace: "fedora" tag: "13" @@ -84,6 +53,7 @@ jobs: quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" image_name: "postgresql-13" docker_context: 13 + - dockerfile: "14/Dockerfile.fedora" registry_namespace: "fedora" tag: "14" @@ -91,6 +61,7 @@ jobs: quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" image_name: "postgresql-14" docker_context: 14 + - dockerfile: "15/Dockerfile.fedora" registry_namespace: "fedora" tag: "15" @@ -98,6 +69,7 @@ jobs: quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN" image_name: "postgresql-15" docker_context: 15 + - dockerfile: "16/Dockerfile.fedora" registry_namespace: "fedora" tag: "16" diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml index 29018d2f..791d6712 100644 --- a/.github/workflows/container-tests.yml +++ b/.github/workflows/container-tests.yml @@ -5,7 +5,7 @@ on: jobs: distgen-check: name: "Check distgen generated files" - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest concurrency: group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }} cancel-in-progress: true @@ -52,13 +52,13 @@ jobs: fi container-tests: needs: distgen-check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}" strategy: fail-fast: false matrix: version: [ "10", "11", "12", "13", "14", "15", "16" ] - os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s", "c8s"] + os_test: [ "fedora", "rhel7", "rhel8", "rhel9", "c9s" ] test_case: [ "container" ] if: | diff --git a/10/Dockerfile.c8s b/10/Dockerfile.c8s deleted file mode 100644 index 9692cd70..00000000 --- a/10/Dockerfile.c8s +++ /dev/null @@ -1,89 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c8s:c8s - -# PostgreSQL image for OpenShift. -# Volumes: -# * /var/lib/pgsql/data - Database cluster for PostgreSQL -# Environment: -# * $POSTGRESQL_USER - Database user name -# * $POSTGRESQL_PASSWORD - User's password -# * $POSTGRESQL_DATABASE - Name of the database to create -# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' -# PostgreSQL administrative account - -ENV POSTGRESQL_VERSION=10 \ - POSTGRESQL_PREV_VERSION=9.6 \ - HOME=/var/lib/pgsql \ - PGUSER=postgres \ - APP_DATA=/opt/app-root - -ENV SUMMARY="PostgreSQL is an advanced Object-Relational database management system" \ - DESCRIPTION="PostgreSQL is an advanced Object-Relational database management system (DBMS). \ -The image contains the client and server programs that you'll need to \ -create, run, maintain and access a PostgreSQL DBMS server." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="PostgreSQL 10" \ - io.openshift.expose-services="5432:postgresql" \ - io.openshift.tags="database,postgresql,postgresql10,postgresql-10" \ - io.openshift.s2i.assemble-user="26" \ - name="sclorg/postgresql-10-c8s" \ - com.redhat.component="postgresql-10-container" \ - version="1" \ - usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 sclorg/postgresql-10-c8s" \ - maintainer="SoftwareCollections.org " - -EXPOSE 5432 - -COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions - -# This image must forever use UID 26 for postgres user so our volumes are -# safe in the future. This should *never* change, the last test is there -# to make sure of that. -RUN yum -y module enable postgresql:10 && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper postgresql-server postgresql-contrib" && \ - yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ - yum -y reinstall tzdata && \ - yum -y clean all --enablerepo='*' && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ - test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ - mkdir -p /var/lib/pgsql/data && \ - /usr/libexec/fix-permissions /var/lib/pgsql /var/run/postgresql - -# Get prefix path and path to scripts rather than hard-code them in scripts -ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \ - ENABLED_COLLECTIONS= - -COPY root / -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Hard links are not supported in Testing Farm approach during sync to guest -# operation system. Therefore tests are failing on error -# /usr/libexec/s2i/run no such file or directory -RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["/var/lib/pgsql/data"] - -# S2I permission fixes -# -------------------- -# 1. unless specified otherwise (or - equivalently - we are in OpenShift), s2i -# build process would be executed as 'uid=26(postgres) gid=26(postgres)'. -# Such process wouldn't be able to execute the default 'assemble' script -# correctly (it transitively executes 'fix-permissions' script). So let's -# add the 'postgres' user into 'root' group here -# -# 2. we call fix-permissions on $APP_DATA here directly (UID=0 during build -# anyways) to assure that s2i process is actually able to _read_ the -# user-specified scripting. -RUN usermod -a -G root postgres && \ - /usr/libexec/fix-permissions --read-only "$APP_DATA" - -USER 26 - -ENTRYPOINT ["container-entrypoint"] -CMD ["run-postgresql"] diff --git a/12/Dockerfile.c8s b/12/Dockerfile.c8s deleted file mode 100644 index 08da9e1b..00000000 --- a/12/Dockerfile.c8s +++ /dev/null @@ -1,90 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c8s:c8s - -# PostgreSQL image for OpenShift. -# Volumes: -# * /var/lib/pgsql/data - Database cluster for PostgreSQL -# Environment: -# * $POSTGRESQL_USER - Database user name -# * $POSTGRESQL_PASSWORD - User's password -# * $POSTGRESQL_DATABASE - Name of the database to create -# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' -# PostgreSQL administrative account - -ENV POSTGRESQL_VERSION=12 \ - POSTGRESQL_PREV_VERSION=10 \ - HOME=/var/lib/pgsql \ - PGUSER=postgres \ - APP_DATA=/opt/app-root - -ENV SUMMARY="PostgreSQL is an advanced Object-Relational database management system" \ - DESCRIPTION="PostgreSQL is an advanced Object-Relational database management system (DBMS). \ -The image contains the client and server programs that you'll need to \ -create, run, maintain and access a PostgreSQL DBMS server." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="PostgreSQL 12" \ - io.openshift.expose-services="5432:postgresql" \ - io.openshift.tags="database,postgresql,postgresql12,postgresql-12" \ - io.openshift.s2i.assemble-user="26" \ - name="sclorg/postgresql-12-c8s" \ - com.redhat.component="postgresql-12-container" \ - version="1" \ - usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 sclorg/postgresql-12-c8s" \ - maintainer="SoftwareCollections.org " - -EXPOSE 5432 - -COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions - -# This image must forever use UID 26 for postgres user so our volumes are -# safe in the future. This should *never* change, the last test is there -# to make sure of that. -RUN yum -y module enable postgresql:12 && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper postgresql-server postgresql-contrib" && \ - INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ - yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ - yum -y reinstall tzdata && \ - yum -y clean all --enablerepo='*' && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ - test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ - mkdir -p /var/lib/pgsql/data && \ - /usr/libexec/fix-permissions /var/lib/pgsql /var/run/postgresql - -# Get prefix path and path to scripts rather than hard-code them in scripts -ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \ - ENABLED_COLLECTIONS= - -COPY root / -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Hard links are not supported in Testing Farm approach during sync to guest -# operation system. Therefore tests are failing on error -# /usr/libexec/s2i/run no such file or directory -RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["/var/lib/pgsql/data"] - -# S2I permission fixes -# -------------------- -# 1. unless specified otherwise (or - equivalently - we are in OpenShift), s2i -# build process would be executed as 'uid=26(postgres) gid=26(postgres)'. -# Such process wouldn't be able to execute the default 'assemble' script -# correctly (it transitively executes 'fix-permissions' script). So let's -# add the 'postgres' user into 'root' group here -# -# 2. we call fix-permissions on $APP_DATA here directly (UID=0 during build -# anyways) to assure that s2i process is actually able to _read_ the -# user-specified scripting. -RUN usermod -a -G root postgres && \ - /usr/libexec/fix-permissions --read-only "$APP_DATA" - -USER 26 - -ENTRYPOINT ["container-entrypoint"] -CMD ["run-postgresql"] diff --git a/13/Dockerfile.c8s b/13/Dockerfile.c8s deleted file mode 100644 index 49a2f789..00000000 --- a/13/Dockerfile.c8s +++ /dev/null @@ -1,90 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c8s:c8s - -# PostgreSQL image for OpenShift. -# Volumes: -# * /var/lib/pgsql/data - Database cluster for PostgreSQL -# Environment: -# * $POSTGRESQL_USER - Database user name -# * $POSTGRESQL_PASSWORD - User's password -# * $POSTGRESQL_DATABASE - Name of the database to create -# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' -# PostgreSQL administrative account - -ENV POSTGRESQL_VERSION=13 \ - POSTGRESQL_PREV_VERSION=12 \ - HOME=/var/lib/pgsql \ - PGUSER=postgres \ - APP_DATA=/opt/app-root - -ENV SUMMARY="PostgreSQL is an advanced Object-Relational database management system" \ - DESCRIPTION="PostgreSQL is an advanced Object-Relational database management system (DBMS). \ -The image contains the client and server programs that you'll need to \ -create, run, maintain and access a PostgreSQL DBMS server." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="PostgreSQL 13" \ - io.openshift.expose-services="5432:postgresql" \ - io.openshift.tags="database,postgresql,postgresql13,postgresql-13" \ - io.openshift.s2i.assemble-user="26" \ - name="sclorg/postgresql-13-c8s" \ - com.redhat.component="postgresql-13-container" \ - version="1" \ - usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 sclorg/postgresql-13-c8s" \ - maintainer="SoftwareCollections.org " - -EXPOSE 5432 - -COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions - -# This image must forever use UID 26 for postgres user so our volumes are -# safe in the future. This should *never* change, the last test is there -# to make sure of that. -RUN yum -y module enable postgresql:13 && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper postgresql-server postgresql-contrib" && \ - INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ - yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ - yum -y reinstall tzdata && \ - yum -y clean all --enablerepo='*' && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ - test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ - mkdir -p /var/lib/pgsql/data && \ - /usr/libexec/fix-permissions /var/lib/pgsql /var/run/postgresql - -# Get prefix path and path to scripts rather than hard-code them in scripts -ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \ - ENABLED_COLLECTIONS= - -COPY root / -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Hard links are not supported in Testing Farm approach during sync to guest -# operation system. Therefore tests are failing on error -# /usr/libexec/s2i/run no such file or directory -RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["/var/lib/pgsql/data"] - -# S2I permission fixes -# -------------------- -# 1. unless specified otherwise (or - equivalently - we are in OpenShift), s2i -# build process would be executed as 'uid=26(postgres) gid=26(postgres)'. -# Such process wouldn't be able to execute the default 'assemble' script -# correctly (it transitively executes 'fix-permissions' script). So let's -# add the 'postgres' user into 'root' group here -# -# 2. we call fix-permissions on $APP_DATA here directly (UID=0 during build -# anyways) to assure that s2i process is actually able to _read_ the -# user-specified scripting. -RUN usermod -a -G root postgres && \ - /usr/libexec/fix-permissions --read-only "$APP_DATA" - -USER 26 - -ENTRYPOINT ["container-entrypoint"] -CMD ["run-postgresql"] diff --git a/15/Dockerfile.c8s b/15/Dockerfile.c8s deleted file mode 100644 index 8579ca0c..00000000 --- a/15/Dockerfile.c8s +++ /dev/null @@ -1,90 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c8s:c8s - -# PostgreSQL image for OpenShift. -# Volumes: -# * /var/lib/pgsql/data - Database cluster for PostgreSQL -# Environment: -# * $POSTGRESQL_USER - Database user name -# * $POSTGRESQL_PASSWORD - User's password -# * $POSTGRESQL_DATABASE - Name of the database to create -# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' -# PostgreSQL administrative account - -ENV POSTGRESQL_VERSION=15 \ - POSTGRESQL_PREV_VERSION=13 \ - HOME=/var/lib/pgsql \ - PGUSER=postgres \ - APP_DATA=/opt/app-root - -ENV SUMMARY="PostgreSQL is an advanced Object-Relational database management system" \ - DESCRIPTION="PostgreSQL is an advanced Object-Relational database management system (DBMS). \ -The image contains the client and server programs that you'll need to \ -create, run, maintain and access a PostgreSQL DBMS server." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="PostgreSQL 15" \ - io.openshift.expose-services="5432:postgresql" \ - io.openshift.tags="database,postgresql,postgresql15,postgresql-15" \ - io.openshift.s2i.assemble-user="26" \ - name="sclorg/postgresql-15-c8s" \ - com.redhat.component="postgresql-15-container" \ - version="1" \ - usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 sclorg/postgresql-15-c8s" \ - maintainer="SoftwareCollections.org " - -EXPOSE 5432 - -COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions - -# This image must forever use UID 26 for postgres user so our volumes are -# safe in the future. This should *never* change, the last test is there -# to make sure of that. -RUN yum -y module enable postgresql:15 && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper postgresql-server postgresql-contrib" && \ - INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ - yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ - yum -y reinstall tzdata && \ - yum -y clean all --enablerepo='*' && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ - test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ - mkdir -p /var/lib/pgsql/data && \ - /usr/libexec/fix-permissions /var/lib/pgsql /var/run/postgresql - -# Get prefix path and path to scripts rather than hard-code them in scripts -ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \ - ENABLED_COLLECTIONS= - -COPY root / -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Hard links are not supported in Testing Farm approach during sync to guest -# operation system. Therefore tests are failing on error -# /usr/libexec/s2i/run no such file or directory -RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["/var/lib/pgsql/data"] - -# S2I permission fixes -# -------------------- -# 1. unless specified otherwise (or - equivalently - we are in OpenShift), s2i -# build process would be executed as 'uid=26(postgres) gid=26(postgres)'. -# Such process wouldn't be able to execute the default 'assemble' script -# correctly (it transitively executes 'fix-permissions' script). So let's -# add the 'postgres' user into 'root' group here -# -# 2. we call fix-permissions on $APP_DATA here directly (UID=0 during build -# anyways) to assure that s2i process is actually able to _read_ the -# user-specified scripting. -RUN usermod -a -G root postgres && \ - /usr/libexec/fix-permissions --read-only "$APP_DATA" - -USER 26 - -ENTRYPOINT ["container-entrypoint"] -CMD ["run-postgresql"] diff --git a/16/Dockerfile.c8s b/16/Dockerfile.c8s deleted file mode 100644 index 0498931d..00000000 --- a/16/Dockerfile.c8s +++ /dev/null @@ -1,90 +0,0 @@ -FROM quay.io/sclorg/s2i-core-c8s:c8s - -# PostgreSQL image for OpenShift. -# Volumes: -# * /var/lib/pgsql/data - Database cluster for PostgreSQL -# Environment: -# * $POSTGRESQL_USER - Database user name -# * $POSTGRESQL_PASSWORD - User's password -# * $POSTGRESQL_DATABASE - Name of the database to create -# * $POSTGRESQL_ADMIN_PASSWORD (Optional) - Password for the 'postgres' -# PostgreSQL administrative account - -ENV POSTGRESQL_VERSION=16 \ - POSTGRESQL_PREV_VERSION=15 \ - HOME=/var/lib/pgsql \ - PGUSER=postgres \ - APP_DATA=/opt/app-root - -ENV SUMMARY="PostgreSQL is an advanced Object-Relational database management system" \ - DESCRIPTION="PostgreSQL is an advanced Object-Relational database management system (DBMS). \ -The image contains the client and server programs that you'll need to \ -create, run, maintain and access a PostgreSQL DBMS server." - -LABEL summary="$SUMMARY" \ - description="$DESCRIPTION" \ - io.k8s.description="$DESCRIPTION" \ - io.k8s.display-name="PostgreSQL 16" \ - io.openshift.expose-services="5432:postgresql" \ - io.openshift.tags="database,postgresql,postgresql16,postgresql-16" \ - io.openshift.s2i.assemble-user="26" \ - name="sclorg/postgresql-16-c8s" \ - com.redhat.component="postgresql-16-container" \ - version="1" \ - usage="podman run -d --name postgresql_database -e POSTGRESQL_USER=user -e POSTGRESQL_PASSWORD=pass -e POSTGRESQL_DATABASE=db -p 5432:5432 sclorg/postgresql-16-c8s" \ - maintainer="SoftwareCollections.org " - -EXPOSE 5432 - -COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions - -# This image must forever use UID 26 for postgres user so our volumes are -# safe in the future. This should *never* change, the last test is there -# to make sure of that. -RUN yum -y module enable postgresql:16 && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper postgresql-server postgresql-contrib" && \ - INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ - yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ - rpm -V $INSTALL_PKGS && \ - postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ - yum -y reinstall tzdata && \ - yum -y clean all --enablerepo='*' && \ - localedef -f UTF-8 -i en_US en_US.UTF-8 && \ - test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ - mkdir -p /var/lib/pgsql/data && \ - /usr/libexec/fix-permissions /var/lib/pgsql /var/run/postgresql - -# Get prefix path and path to scripts rather than hard-code them in scripts -ENV CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/postgresql \ - ENABLED_COLLECTIONS= - -COPY root / -COPY ./s2i/bin/ $STI_SCRIPTS_PATH - -# Hard links are not supported in Testing Farm approach during sync to guest -# operation system. Therefore tests are failing on error -# /usr/libexec/s2i/run no such file or directory -RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run - -# Not using VOLUME statement since it's not working in OpenShift Online: -# https://github.com/sclorg/httpd-container/issues/30 -# VOLUME ["/var/lib/pgsql/data"] - -# S2I permission fixes -# -------------------- -# 1. unless specified otherwise (or - equivalently - we are in OpenShift), s2i -# build process would be executed as 'uid=26(postgres) gid=26(postgres)'. -# Such process wouldn't be able to execute the default 'assemble' script -# correctly (it transitively executes 'fix-permissions' script). So let's -# add the 'postgres' user into 'root' group here -# -# 2. we call fix-permissions on $APP_DATA here directly (UID=0 during build -# anyways) to assure that s2i process is actually able to _read_ the -# user-specified scripting. -RUN usermod -a -G root postgres && \ - /usr/libexec/fix-permissions --read-only "$APP_DATA" - -USER 26 - -ENTRYPOINT ["container-entrypoint"] -CMD ["run-postgresql"] diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 230c3739..cdb71108 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -12,9 +12,6 @@ - filename: postgresql-centos.json latest: "16-el9" distros: - - name: CentOS Stream 8 - app_versions: [10, 12, 13, 15] - - name: CentOS Stream 9 app_versions: [13, 15, 16] diff --git a/imagestreams/postgresql-centos.json b/imagestreams/postgresql-centos.json index 35eaeed7..bc139daf 100644 --- a/imagestreams/postgresql-centos.json +++ b/imagestreams/postgresql-centos.json @@ -9,78 +9,6 @@ }, "spec": { "tags": [ - { - "name": "10-el8", - "annotations": { - "openshift.io/display-name": "PostgreSQL 10 (CentOS Stream 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql", - "version": "10" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-10-c8s:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12-el8", - "annotations": { - "openshift.io/display-name": "PostgreSQL 12 (CentOS Stream 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql", - "version": "12" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-12-c8s:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "13-el8", - "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql", - "version": "13" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-13-c8s:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "15-el8", - "annotations": { - "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql", - "version": "15" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/postgresql-15-c8s:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "13-el9", "annotations": { diff --git a/manifest.yml b/manifest.yml index fbbe1996..e038f2b2 100644 --- a/manifest.yml +++ b/manifest.yml @@ -38,9 +38,6 @@ DISTGEN_MULTI_RULES: - src: src/Dockerfile dest: Dockerfile.c9s - - src: src/Dockerfile - dest: Dockerfile.c8s - - src: src/Dockerfile.fedora dest: Dockerfile.fedora diff --git a/specs/multispec.yml b/specs/multispec.yml index 2631a700..b08de54b 100644 --- a/specs/multispec.yml +++ b/specs/multispec.yml @@ -89,20 +89,6 @@ specs: pkgs: "postgresql-server postgresql-contrib" environment_setup: >-4 { yum -y module enable postgresql:{{ spec.version }} || :; } && \ - c8s: - distros: - - centos-stream-8-x86_64 - s2i_base: quay.io/sclorg/s2i-core-c8s:c8s - org: "sclorg" - prod: "c8s" - openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}" - redhat_component: "postgresql-{{ spec.short }}-container" - img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}" - pkgs: "postgresql-server postgresql-contrib" - environment_setup: >-4 - yum -y module enable postgresql:{{ spec.version }} && \ - post_install: >-4 - yum -y reinstall tzdata && \ version: "10": @@ -167,34 +153,35 @@ specs: matrix: - exclude: - - distros: + include: + - version: "10" + distros: + - rhel-7-x86_64 + - rhel-8-x86_64 + - version: "12" + distros: + - rhel-7-x86_64 + - rhel-8-x86_64 + - fedora-38-x86_64 + - version: "13" + distros: + - rhel-7-x86_64 + - rhel-8-x86_64 - rhel-9-x86_64 - - centos-7-x86_64 - centos-stream-9-x86_64 - fedora-38-x86_64 - version: "10" - - distros: + - version: "14" + distros: + - fedora-38-x86_64 + - version: "15" + distros: + - rhel-8-x86_64 - rhel-9-x86_64 - - centos-7-x86_64 - centos-stream-9-x86_64 - version: "12" - - distros: - - centos-7-x86_64 - version: "13" - - distros: - - centos-7-x86_64 - - rhel-7-x86_64 - - centos-stream-8-x86_64 + - fedora-38-x86_64 + - version: "16" + distros: - rhel-8-x86_64 - - centos-stream-9-x86_64 - rhel-9-x86_64 - version: "14" - - distros: - - rhel-7-x86_64 - - centos-7-x86_64 - version: "15" - - distros: - - rhel-7-x86_64 - - centos-7-x86_64 - version: "16" + - centos-stream-9-x86_64 + - fedora-38-x86_64 diff --git a/src/Dockerfile b/src/Dockerfile index 7f84f3b6..dd934cd4 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -73,7 +73,7 @@ RUN {{ spec.environment_setup }} {% if spec.version not in ["9.6", "10", "11"] %} {% if spec.prod == 'rhel7' or spec.prod == 'centos7' %} INSTALL_PKGS="$INSTALL_PKGS rh-postgresql{{ spec.short }}-pgaudit" && \ - {% elif spec.prod == 'rhel8' or spec.prod == 'rhel9' or spec.prod == 'c9s' or spec.prod == 'c8s' %} + {% elif spec.prod == 'rhel8' or spec.prod == 'rhel9' or spec.prod == 'c9s' %} INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ {% endif %} {% endif %} @@ -101,7 +101,7 @@ COPY ./s2i/bin/ $STI_SCRIPTS_PATH # /usr/libexec/s2i/run no such file or directory RUN ln -s /usr/bin/run-postgresql $STI_SCRIPTS_PATH/run -{% if spec.prod != "rhel8" and spec.prod != "rhel9" and config.os.id != "fedora" and spec.prod != "c8s" and spec.prod != "c9s" %} +{% if spec.prod != "rhel8" and spec.prod != "rhel9" and config.os.id != "fedora" and spec.prod != "c9s" %} # When bash is started non-interactively, to run a shell script, for example it # looks for this variable and source the content of this file. This will enable # the SCL for all scripts without need to do 'scl enable'.