From cfb512eff64abff7b617ef9c968ba30e66940699 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Tue, 15 Nov 2022 21:37:51 +0100 Subject: [PATCH] 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. --- 5.26-mod_fcgid/Dockerfile.rhel8 | 1 + 5.26/Dockerfile.fedora | 1 + 5.30-mod_fcgid/Dockerfile.rhel8 | 1 + 5.30/Dockerfile.fedora | 1 + 5.32/Dockerfile.c9s | 1 + 5.32/Dockerfile.fedora | 1 + 5.32/Dockerfile.rhel9 | 1 + 5.34/Dockerfile.c9s | 1 + 5.34/Dockerfile.fedora | 1 + common | 2 +- 10 files changed, 10 insertions(+), 1 deletion(-) diff --git a/5.26-mod_fcgid/Dockerfile.rhel8 b/5.26-mod_fcgid/Dockerfile.rhel8 index bc47f8b..f013230 100644 --- a/5.26-mod_fcgid/Dockerfile.rhel8 +++ b/5.26-mod_fcgid/Dockerfile.rhel8 @@ -42,6 +42,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" yum -y --allowerasing distrosync && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ yum -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.26/Dockerfile.fedora b/5.26/Dockerfile.fedora index 7180f8e..12c624d 100644 --- a/5.26/Dockerfile.fedora +++ b/5.26/Dockerfile.fedora @@ -36,6 +36,7 @@ LABEL summary="$SUMMARY" \ RUN INSTALL_PKGS="perl perl-devel mod_perl perl-CPAN perl-App-cpanminus httpd python2" && \ dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ dnf clean all # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.30-mod_fcgid/Dockerfile.rhel8 b/5.30-mod_fcgid/Dockerfile.rhel8 index 394758c..a3b94c5 100644 --- a/5.30-mod_fcgid/Dockerfile.rhel8 +++ b/5.30-mod_fcgid/Dockerfile.rhel8 @@ -42,6 +42,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" yum -y --allowerasing distrosync && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ yum -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.30/Dockerfile.fedora b/5.30/Dockerfile.fedora index 101aa4b..4652f18 100644 --- a/5.30/Dockerfile.fedora +++ b/5.30/Dockerfile.fedora @@ -38,6 +38,7 @@ LABEL summary="$SUMMARY" \ RUN INSTALL_PKGS="perl perl-devel mod_perl perl-CPAN perl-App-cpanminus httpd python2" && \ dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ dnf clean all # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.32/Dockerfile.c9s b/5.32/Dockerfile.c9s index 78fb313..b01dda5 100644 --- a/5.32/Dockerfile.c9s +++ b/5.32/Dockerfile.c9s @@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" yum -y --allowerasing distrosync && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ yum -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.32/Dockerfile.fedora b/5.32/Dockerfile.fedora index 6f1e8df..aaeb758 100644 --- a/5.32/Dockerfile.fedora +++ b/5.32/Dockerfile.fedora @@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" dnf -y module enable perl:$PERL_VERSION && \ dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ dnf -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.32/Dockerfile.rhel9 b/5.32/Dockerfile.rhel9 index cf18955..a79048a 100644 --- a/5.32/Dockerfile.rhel9 +++ b/5.32/Dockerfile.rhel9 @@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" yum -y --allowerasing distrosync && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ yum -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.34/Dockerfile.c9s b/5.34/Dockerfile.c9s index f7b5ad3..535fe1a 100644 --- a/5.34/Dockerfile.c9s +++ b/5.34/Dockerfile.c9s @@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" yum -y --allowerasing distrosync && \ yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ yum -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/5.34/Dockerfile.fedora b/5.34/Dockerfile.fedora index d83c5bb..3032285 100644 --- a/5.34/Dockerfile.fedora +++ b/5.34/Dockerfile.fedora @@ -39,6 +39,7 @@ RUN INSTALL_PKGS="perl perl-devel mod_fcgid perl-App-cpanminus perl-FCGI patch" dnf -y module enable perl:$PERL_VERSION && \ dnf install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + perl -v | grep -qe "v$PERL_VERSION\." && echo "Found VERSION $PERL_VERSION" && \ dnf -y clean all --enablerepo='*' # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH diff --git a/common b/common index baa8bb4..ef528b3 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit baa8bb4813631eeaad4bc1b3755aa510ada12a72 +Subproject commit ef528b3689dc75bbfdd5b57251699c4101ef17c6