[gimp-web/oscp] testing.docs: Add CI, switch httpd to UBI9, drop LE stanzas

[Bartłomiej Piotrowski <bpiotrowski src gnome org>]

commit a0238caf01d7544017601ac7e6c6a64593074f61
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue May 24 16:01:25 2022 +0200

    testing.docs: Add CI, switch httpd to UBI9, drop LE stanzas

 .gitlab-ci.yml                                            | 14 ++++++++++++++
 testing.docs.gimp.org/docs_build/Dockerfile               |  5 -----
 testing.docs.gimp.org/docs_build/entrypoint.sh            |  2 +-
 testing.docs.gimp.org/httpd/Dockerfile                    | 15 +++++++--------
 .../httpd/app_data/httpd-cfg/testing.docs.gimp.org.conf   |  5 -----
 5 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4ad032f..1e0e2c9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,3 +58,17 @@ docs_build:
   variables:
     OCI_TAG: docs_build
     CI_JOB_NAME: docs.gimp.org/docs_build
+
+testing.docs.gimp.org:
+  extends:
+    - .build
+  variables:
+    OCI_TAG: testing_docs
+    CI_JOB_NAME: testing.docs.gimp.org/httpd
+
+testing_docs_build:
+  extends:
+    - .build
+  variables:
+    OCI_TAG: testing_docs_build
+    CI_JOB_NAME: docs.gimp.org/docs_build
diff --git a/testing.docs.gimp.org/docs_build/Dockerfile b/testing.docs.gimp.org/docs_build/Dockerfile
index bdc4a682..32fdcfb7 100644
--- a/testing.docs.gimp.org/docs_build/Dockerfile
+++ b/testing.docs.gimp.org/docs_build/Dockerfile
@@ -1,15 +1,10 @@
 FROM debian:testing
-USER root
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     automake build-essential docbook-xml docbook-xsl pkg-config \
     pngcrush pngnq python3 python3-libxml2 xsltproc gettext git \
     ca-certificates rsync docbook-website librsvg2-bin fonts-noto-cjk
 
-RUN groupadd gimpdocs -g 1000580000 && \
-    useradd gimpdocs -g 1000580000 -u 1000580000 -r -l -m
-
 ADD entrypoint.sh /entrypoint.sh
 
-USER 1000580000
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/testing.docs.gimp.org/docs_build/entrypoint.sh b/testing.docs.gimp.org/docs_build/entrypoint.sh
index d9105fa7..bd3138ba 100755
--- a/testing.docs.gimp.org/docs_build/entrypoint.sh
+++ b/testing.docs.gimp.org/docs_build/entrypoint.sh
@@ -6,7 +6,7 @@ set -e
 RELEASE=2.10
 BUILD_PATH=/tmp/gimp-help
 
-git clone --depth 1 -b gimp-help-${RELEASE//\./\-} https://gitlab.gnome.org/GNOME/gimp-help.git ${BUILD_PATH}
+git clone --depth 1 --single-branch -b gimp-help-${RELEASE//\./\-} 
https://gitlab.gnome.org/GNOME/gimp-help.git ${BUILD_PATH}
 cd ${BUILD_PATH}/web && BUILD_DIR='.' make
 cd ${BUILD_PATH} && ./autogen.sh --without-gimp --prefix=${BUILD_PATH}/build && make && make install
 
diff --git a/testing.docs.gimp.org/httpd/Dockerfile b/testing.docs.gimp.org/httpd/Dockerfile
index 842bb8b2..93b3508c 100644
--- a/testing.docs.gimp.org/httpd/Dockerfile
+++ b/testing.docs.gimp.org/httpd/Dockerfile
@@ -1,10 +1,9 @@
-FROM centos/httpd-24-centos7
-USER root
+FROM registry.access.redhat.com/ubi9/httpd-24
 
-COPY app_data /opt/app-root/src
-RUN  chown -R 1000580000:1000580000 /opt/app-root/src
+USER 0
+ADD app_data /tmp/src
+RUN chown -R 1001:0 /tmp/src
 
-EXPOSE 8080
-
-USER 1000580000
-ENTRYPOINT ["/usr/bin/run-httpd"]
+USER 1001
+RUN /usr/libexec/s2i/assemble
+CMD /usr/libexec/s2i/run
diff --git a/testing.docs.gimp.org/httpd/app_data/httpd-cfg/testing.docs.gimp.org.conf 
b/testing.docs.gimp.org/httpd/app_data/httpd-cfg/testing.docs.gimp.org.conf
index a425c6a1..1d34f878 100644
--- a/testing.docs.gimp.org/httpd/app_data/httpd-cfg/testing.docs.gimp.org.conf
+++ b/testing.docs.gimp.org/httpd/app_data/httpd-cfg/testing.docs.gimp.org.conf
@@ -1,6 +1,5 @@
 <VirtualHost *:8080>
     ServerName testing.docs.gimp.org
-    ServerAlias testing-gimp-docs.openshift.gnome.org
 
     ServerAdmin webmaster gimp org
     DocumentRoot /docs_data/docs
@@ -35,7 +34,3 @@
 <Directory "/docs_data/docs">
   Require all granted
 </Directory>
-
-<LocationMatch "^/.well-known/acme-challenge">
-  RedirectMatch ^(.*) https://letsencrypt.gnome.org$1
-</LocationMatch>