From 217d7ecfe50c401268d6f22563d52da2e859e5a4 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 15 Nov 2022 21:59:00 +0100 Subject: [PATCH 1/2] Add a test in Dockerfile directly to check the version Otherwise when a wrong stream is installed, it's only found by scl test, which is too late in the process and might even go through uncought, especially when the scl test is removed for non-SCL distros at some point. --- 10/Dockerfile.c8s | 1 + 10/Dockerfile.centos7 | 1 + 10/Dockerfile.rhel7 | 1 + 10/Dockerfile.rhel8 | 1 + 12/Dockerfile.c8s | 1 + 12/Dockerfile.centos7 | 1 + 12/Dockerfile.fedora | 1 + 12/Dockerfile.rhel7 | 1 + 12/Dockerfile.rhel8 | 1 + 13/Dockerfile.c8s | 1 + 13/Dockerfile.c9s | 1 + 13/Dockerfile.centos7 | 1 + 13/Dockerfile.fedora | 1 + 13/Dockerfile.rhel7 | 1 + 13/Dockerfile.rhel8 | 1 + 13/Dockerfile.rhel9 | 1 + src/Dockerfile | 1 + src/Dockerfile.fedora | 1 + 18 files changed, 18 insertions(+) diff --git a/10/Dockerfile.c8s b/10/Dockerfile.c8s index 7bf0d107..9aff4d3e 100644 --- a/10/Dockerfile.c8s +++ b/10/Dockerfile.c8s @@ -45,6 +45,7 @@ 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 && \ diff --git a/10/Dockerfile.centos7 b/10/Dockerfile.centos7 index d5315c79..2cf2e3f3 100644 --- a/10/Dockerfile.centos7 +++ b/10/Dockerfile.centos7 @@ -45,6 +45,7 @@ RUN yum install -y centos-release-scl-rh && \ INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper rh-postgresql10 rh-postgresql10-postgresql-contrib rh-postgresql10-syspaths rh-postgresql96-postgresql-server" && \ 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 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)" && \ diff --git a/10/Dockerfile.rhel7 b/10/Dockerfile.rhel7 index f015cae6..acb94437 100644 --- a/10/Dockerfile.rhel7 +++ b/10/Dockerfile.rhel7 @@ -49,6 +49,7 @@ RUN yum install -y yum-utils gettext && \ INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper rh-postgresql10 rh-postgresql10-postgresql-contrib rh-postgresql10-syspaths rh-postgresql96-postgresql-server" && \ 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 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)" && \ diff --git a/10/Dockerfile.rhel8 b/10/Dockerfile.rhel8 index 33cbdbe3..00e5a917 100644 --- a/10/Dockerfile.rhel8 +++ b/10/Dockerfile.rhel8 @@ -46,6 +46,7 @@ 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 && \ diff --git a/12/Dockerfile.c8s b/12/Dockerfile.c8s index 7251587e..946cd278 100644 --- a/12/Dockerfile.c8s +++ b/12/Dockerfile.c8s @@ -46,6 +46,7 @@ RUN yum -y module enable postgresql:12 && \ 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 && \ diff --git a/12/Dockerfile.centos7 b/12/Dockerfile.centos7 index bd5c7c9e..0d8102e1 100644 --- a/12/Dockerfile.centos7 +++ b/12/Dockerfile.centos7 @@ -46,6 +46,7 @@ RUN yum install -y centos-release-scl-rh && \ INSTALL_PKGS="$INSTALL_PKGS rh-postgresql12-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 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)" && \ diff --git a/12/Dockerfile.fedora b/12/Dockerfile.fedora index 1fc8dfdb..2915ad69 100644 --- a/12/Dockerfile.fedora +++ b/12/Dockerfile.fedora @@ -50,6 +50,7 @@ RUN INSTALL_PKGS="rsync tar gettext bind-utils postgresql-server postgresql-cont dnf -y module enable postgresql:12 && \ dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ dnf clean all && \ test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ mkdir -p /var/lib/pgsql/data && \ diff --git a/12/Dockerfile.rhel7 b/12/Dockerfile.rhel7 index 0bdbb6be..75e7b688 100644 --- a/12/Dockerfile.rhel7 +++ b/12/Dockerfile.rhel7 @@ -50,6 +50,7 @@ RUN yum install -y yum-utils gettext && \ INSTALL_PKGS="$INSTALL_PKGS rh-postgresql12-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 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)" && \ diff --git a/12/Dockerfile.rhel8 b/12/Dockerfile.rhel8 index e387a241..2ff4eae9 100644 --- a/12/Dockerfile.rhel8 +++ b/12/Dockerfile.rhel8 @@ -47,6 +47,7 @@ RUN yum -y module enable postgresql:12 && \ 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 && \ diff --git a/13/Dockerfile.c8s b/13/Dockerfile.c8s index e4e526a4..60130b92 100644 --- a/13/Dockerfile.c8s +++ b/13/Dockerfile.c8s @@ -46,6 +46,7 @@ RUN yum -y module enable postgresql:13 && \ 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 && \ diff --git a/13/Dockerfile.c9s b/13/Dockerfile.c9s index 69aa8ed2..65bdb635 100644 --- a/13/Dockerfile.c9s +++ b/13/Dockerfile.c9s @@ -46,6 +46,7 @@ RUN { yum -y module enable postgresql:13 || :; } && \ 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 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)" && \ diff --git a/13/Dockerfile.centos7 b/13/Dockerfile.centos7 index 4ffeb76e..70c67bdf 100644 --- a/13/Dockerfile.centos7 +++ b/13/Dockerfile.centos7 @@ -46,6 +46,7 @@ RUN yum install -y centos-release-scl-rh && \ INSTALL_PKGS="$INSTALL_PKGS rh-postgresql13-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 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)" && \ diff --git a/13/Dockerfile.fedora b/13/Dockerfile.fedora index 1bdfea34..c9178e84 100644 --- a/13/Dockerfile.fedora +++ b/13/Dockerfile.fedora @@ -50,6 +50,7 @@ RUN INSTALL_PKGS="rsync tar gettext bind-utils postgresql-server postgresql-cont dnf -y module enable postgresql:13 && \ dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ dnf clean all && \ test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ mkdir -p /var/lib/pgsql/data && \ diff --git a/13/Dockerfile.rhel7 b/13/Dockerfile.rhel7 index 9bbe5ff9..93939459 100644 --- a/13/Dockerfile.rhel7 +++ b/13/Dockerfile.rhel7 @@ -50,6 +50,7 @@ RUN yum install -y yum-utils gettext && \ INSTALL_PKGS="$INSTALL_PKGS rh-postgresql13-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 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)" && \ diff --git a/13/Dockerfile.rhel8 b/13/Dockerfile.rhel8 index 0be804fb..622f056c 100644 --- a/13/Dockerfile.rhel8 +++ b/13/Dockerfile.rhel8 @@ -47,6 +47,7 @@ RUN yum -y module enable postgresql:13 && \ 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 && \ diff --git a/13/Dockerfile.rhel9 b/13/Dockerfile.rhel9 index 23d2a439..f448a5dd 100644 --- a/13/Dockerfile.rhel9 +++ b/13/Dockerfile.rhel9 @@ -47,6 +47,7 @@ RUN { yum -y module enable postgresql:13 || :; } && \ 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 && \ diff --git a/src/Dockerfile b/src/Dockerfile index 13cc091f..a63d00ea 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -79,6 +79,7 @@ RUN {{ spec.environment_setup }} {% endif %} yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ {% if spec.post_install %} {{ spec.post_install }} {% endif %} diff --git a/src/Dockerfile.fedora b/src/Dockerfile.fedora index 577e775a..0cccbaed 100644 --- a/src/Dockerfile.fedora +++ b/src/Dockerfile.fedora @@ -52,6 +52,7 @@ RUN INSTALL_PKGS="rsync tar gettext bind-utils postgresql-server postgresql-cont dnf -y module enable postgresql:{{ spec.version }} && \ dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \ dnf clean all && \ test "$(id postgres)" = "uid=26(postgres) gid=26(postgres) groups=26(postgres)" && \ mkdir -p /var/lib/pgsql/data && \ From 98ac6a43aea449ce095f803722cbe64ba1054329 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 9 Feb 2023 14:13:34 +0100 Subject: [PATCH 2/2] Add the latest container-common-scripts Signed-off-by: Petr "Stone" Hracek --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 835ee1e7..4d21ab6c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 835ee1e7d957e9eb4002ba0df1e2e5ce1b80e93c +Subproject commit 4d21ab6c92f5845aaa0c52f30abe4a86ac56c09c