diff --git a/6/Dockerfile.c8s b/6/Dockerfile.c8s index d9dab49..1cf5f66 100644 --- a/6/Dockerfile.c8s +++ b/6/Dockerfile.c8s @@ -9,7 +9,8 @@ Varnish Cache stores web pages in memory so web servers don't have to create \ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ VARNISH_VCL=/etc/varnish/default.vcl \ - VARNISH_CONFIGURATION_PATH=/etc/varnish + VARNISH_CONFIGURATION_PATH=/etc/varnish \ + VARNISH_VERSION=6 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -30,6 +31,7 @@ RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \ rpm -V $INSTALL_PKGS && \ fix-permissions $VARNISH_CONFIGURATION_PATH && \ fix-permissions /var/lib/varnish && \ + varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \ yum -y clean all --enablerepo='*' diff --git a/6/Dockerfile.c9s b/6/Dockerfile.c9s index c017aef..decb8a7 100644 --- a/6/Dockerfile.c9s +++ b/6/Dockerfile.c9s @@ -9,7 +9,8 @@ Varnish Cache stores web pages in memory so web servers don't have to create \ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ VARNISH_VCL=/etc/varnish/default.vcl \ - VARNISH_CONFIGURATION_PATH=/etc/varnish + VARNISH_CONFIGURATION_PATH=/etc/varnish \ + VARNISH_VERSION=6 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -29,6 +30,7 @@ RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \ rpm -V $INSTALL_PKGS && \ fix-permissions $VARNISH_CONFIGURATION_PATH && \ fix-permissions /var/lib/varnish && \ + varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \ yum -y clean all --enablerepo='*' diff --git a/6/Dockerfile.rhel7 b/6/Dockerfile.rhel7 index 11ea07b..1105b1a 100644 --- a/6/Dockerfile.rhel7 +++ b/6/Dockerfile.rhel7 @@ -9,7 +9,8 @@ Varnish Cache stores web pages in memory so web servers don't have to create \ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ VARNISH_VCL=/etc/opt/rh/rh-varnish6/varnish/default.vcl \ - VARNISH_CONFIGURATION_PATH=/etc/opt/rh/rh-varnish6/varnish + VARNISH_CONFIGURATION_PATH=/etc/opt/rh/rh-varnish6/varnish \ + VARNISH_VERSION=6 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -28,6 +29,7 @@ RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils rh-varnish6-varnish gc prepare-yum-repositories rhel-server-rhscl-7-rpms && \ yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \ rpm -V $INSTALL_PKGS && \ + scl enable rh-varnish$VARNISH_VERSION -- varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \ yum -y clean all --enablerepo='*' diff --git a/6/Dockerfile.rhel8 b/6/Dockerfile.rhel8 index 400f54e..982d76f 100644 --- a/6/Dockerfile.rhel8 +++ b/6/Dockerfile.rhel8 @@ -9,7 +9,8 @@ Varnish Cache stores web pages in memory so web servers don't have to create \ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ VARNISH_VCL=/etc/varnish/default.vcl \ - VARNISH_CONFIGURATION_PATH=/etc/varnish + VARNISH_CONFIGURATION_PATH=/etc/varnish \ + VARNISH_VERSION=6 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -30,6 +31,7 @@ RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \ rpm -V $INSTALL_PKGS && \ fix-permissions $VARNISH_CONFIGURATION_PATH && \ fix-permissions /var/lib/varnish && \ + varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \ yum -y clean all --enablerepo='*' diff --git a/6/Dockerfile.rhel9 b/6/Dockerfile.rhel9 index 30fd1e0..04c619e 100644 --- a/6/Dockerfile.rhel9 +++ b/6/Dockerfile.rhel9 @@ -9,7 +9,8 @@ Varnish Cache stores web pages in memory so web servers don't have to create \ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ VARNISH_VCL=/etc/varnish/default.vcl \ - VARNISH_CONFIGURATION_PATH=/etc/varnish + VARNISH_CONFIGURATION_PATH=/etc/varnish \ + VARNISH_VERSION=6 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -29,6 +30,7 @@ RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \ rpm -V $INSTALL_PKGS && \ fix-permissions $VARNISH_CONFIGURATION_PATH && \ fix-permissions /var/lib/varnish && \ + varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \ yum -y clean all --enablerepo='*' diff --git a/7/Dockerfile.fedora b/7/Dockerfile.fedora index 77b08b0..26ba108 100644 --- a/7/Dockerfile.fedora +++ b/7/Dockerfile.fedora @@ -10,7 +10,8 @@ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ VERSION=0 \ VARNISH_VCL=/etc/varnish/default.vcl \ - VARNISH_CONFIGURATION_PATH=/etc/varnish + VARNISH_CONFIGURATION_PATH=/etc/varnish \ + VARNISH_VERSION=7 LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -29,6 +30,7 @@ RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish" && \ rpm -V $INSTALL_PKGS && \ fix-permissions $VARNISH_CONFIGURATION_PATH && \ fix-permissions /var/lib/varnish && \ + varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \ dnf -y clean all --enablerepo='*' diff --git a/src/Dockerfile.template b/src/Dockerfile.template index 3aa2b31..51daaf2 100644 --- a/src/Dockerfile.template +++ b/src/Dockerfile.template @@ -10,7 +10,8 @@ running Varnish server or building Varnish-based application. \ Varnish Cache stores web pages in memory so web servers don't have to create \ the same web page over and over again. Varnish Cache serves pages much faster \ than any application server; giving the website a significant speed up." \ -{{ macros.env(config, spec) }} +{{ macros.env(config, spec) }} \ + VARNISH_VERSION={{ spec.version }} LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ @@ -34,6 +35,10 @@ RUN {{ macros.populate_install_pkgs(spec) }} {% if config.os.id == "fedora" or spec.prod == "rhel8" or spec.prod == "rhel9" or spec.prod == "c8s" or spec.prod == "c9s" %} fix-permissions $VARNISH_CONFIGURATION_PATH && \ fix-permissions /var/lib/varnish && \ + varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ + {% endif %} + {% if spec.prod == "rhel7" %} + scl enable rh-varnish$VARNISH_VERSION -- varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \ {% endif %} rm -f /etc/profile.d/lang.sh && \ rm -f /etc/profile.d/lang.csh && \