Update Fedora version and add proper C10S name

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>

6/Dockerfile.c9s

@@ -21,7 +21,7 @@ LABEL summary="$SUMMARY" \
       com.redhat.component="varnish-6-container" \
       com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
       version="1" \
-      usage="s2i build https://github.com/sclorg/varnish-container.git --context-dir=6/test/test-app/  sample-server" \
+      usage="s2i build https://github.com/sclorg/varnish-container.git --context-dir=6/test/test-app/ quay.io/sclorg/varnish-6-c9s sample-server" \
       name="sclorg/varnish-6-c9s" \
       maintainer="Uhliarik Lubos <luhliari@redhat.com>"
 

7/Dockerfile.c10s

@@ -0,0 +1,51 @@
+FROM quay.io/sclorg/s2i-core-c10s:c10s
+EXPOSE 8080
+EXPOSE 8443
+
+ENV SUMMARY="Platform for running Varnish or building Varnish-based application" \
+    DESCRIPTION="Varnish available as container is a base platform for \
+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." \
+    VARNISH_VCL=/etc/varnish/default.vcl \
+    VARNISH_CONFIGURATION_PATH=/etc/varnish \
+    VARNISH_VERSION=7
+
+LABEL summary="$SUMMARY" \
+      description="$DESCRIPTION" \
+      io.k8s.description="$DESCRIPTION" \
+      io.k8s.display-name="Varnish 7" \
+      io.openshift.expose-services="8080:http,8443:https" \
+      io.openshift.tags="builder,varnish7,varnish-7" \
+      com.redhat.component="varnish-7-container" \
+      com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#rhel" \
+      version="1" \
+      usage="s2i build https://github.com/sclorg/varnish-container.git --context-dir=7/test/test-app/ quay.io/sclorg/varnish-7-c10s sample-server" \
+      name="sclorg/varnish-7-c10s" \
+      maintainer="Uhliarik Lubos <luhliari@redhat.com>"
+
+RUN INSTALL_PKGS="gettext hostname nss_wrapper bind-utils varnish gcc" && \
+    yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
+    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='*'
+
+# Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
+COPY 7/s2i/bin/ $STI_SCRIPTS_PATH
+
+# Copy extra files to the image.
+COPY 7/root/ /
+
+RUN chmod -R a+rwx ${APP_ROOT}/etc && \
+    chown -R 1001:0 ${APP_ROOT}
+# Reset permissions of filesystem to default values
+RUN rpm-file-permissions
+
+USER 1001
+
+CMD $STI_SCRIPTS_PATH/usage

7/Dockerfile.fedora

@@ -1,4 +1,4 @@
-FROM quay.io/fedora/s2i-core:38
+FROM quay.io/fedora/s2i-core:39
 EXPOSE 8080
 EXPOSE 8443
 

specs/multispec.yml

@@ -4,8 +4,8 @@ specs:
   distroinfo:
     fedora:
       distros:
-        - fedora-38-x86_64
-      s2i_base: quay.io/fedora/s2i-core:38
+        - fedora-39-x86_64
+      s2i_base: quay.io/fedora/s2i-core:39
       install_pkgs: "gettext hostname nss_wrapper bind-utils varnish"
       img_name: "fedora/varnish-7"
       full_img_name: "quay.io/{{ spec.img_name }}"
@@ -42,6 +42,7 @@ specs:
       prod: "c9s"
       install_pkgs: "gettext hostname nss_wrapper bind-utils varnish gcc"
       img_name: "{{ spec.org }}/varnish-{{ spec.version }}-{{ spec.prod }}"
+      full_img_name: "quay.io/{{ spec.img_name }}"
       etc_path: /etc
     c10s:
       distros:
@@ -54,6 +55,7 @@ specs:
       prod: "c10s"
       install_pkgs: "gettext hostname nss_wrapper bind-utils varnish gcc"
       img_name: "{{ spec.org }}/varnish-{{ spec.version }}-{{ spec.prod }}"
+      full_img_name: "quay.io/{{ spec.img_name }}"
       etc_path: /etc
   version:
     "6":
@@ -69,6 +71,6 @@ matrix:
         - centos-stream-9-x86_64
       version: "6"
     - distros:
-        - fedora-38-x86_64
-        - centos-stream-10-xc86_64
+        - fedora-39-x86_64
+        - centos-stream-10-x86_64
       version: "7"

src/Dockerfile.template

@@ -29,7 +29,7 @@ RUN INSTALL_PKGS="{{ spec.install_pkgs }}" && \
     {% endif %}
     {{ commands.pkginstaller.install([], {'docs': False}) }} $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
-    {% if config.os.id == "fedora" or spec.prod == "rhel8" or spec.prod == "rhel9" or spec.prod == "c9s" %}
+    {% if config.os.id == "fedora" or spec.prod == "rhel8" or spec.prod == "rhel9" or spec.prod == "c9s" or spec.prod == "c10s" %}
     fix-permissions $VARNISH_CONFIGURATION_PATH && \
     fix-permissions /var/lib/varnish && \
     varnishd -V 2>&1 | grep -qe "varnish-$VARNISH_VERSION\." && echo "Found VERSION $VARNISH_VERSION" && \