[gimp-web/oscp] www: Switch to UBI9, drop Let's Encrypt locations

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

commit 38016423cb660326fcb55d5e4f63c0025bc090be
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Tue May 24 15:20:02 2022 +0200

    www: Switch to UBI9, drop Let's Encrypt locations

 .gitlab-ci.yml                                         |  6 ++++++
 www.gimp.org/Dockerfile                                | 17 ++++++++---------
 www.gimp.org/app_data/httpd-cfg/registry.gimp.org.conf |  5 -----
 www.gimp.org/app_data/httpd-cfg/www.gimp.org.conf      |  4 ----
 4 files changed, 14 insertions(+), 18 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea9c91d0..b217338d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,3 +32,9 @@ static.gimp.org:
     - .build
   variables:
     OCI_TAG: static
+
+www.gimp.org:
+  extends:
+    - .build
+  variables:
+    OCI_TAG: www
diff --git a/www.gimp.org/Dockerfile b/www.gimp.org/Dockerfile
index 32a076af..61846107 100644
--- a/www.gimp.org/Dockerfile
+++ b/www.gimp.org/Dockerfile
@@ -1,4 +1,5 @@
 FROM quay.io/centos/centos:stream8
+
 RUN dnf install -y python3-pip git make
 
 ARG branch=master
@@ -11,14 +12,12 @@ RUN git clone --depth 1 --branch $branch https://gitlab.gnome.org/Infrastructure
     pip3 install -r py3-requirements.txt && \
     make $target
 
-FROM centos/httpd-24-centos7
-USER root
-
-COPY app_data /opt/app-root/src
-COPY --from=0 /gimp-web/output /opt/app-root/src/html
-RUN  chown -R 1000580000:1000580000 /opt/app-root/src
+FROM registry.access.redhat.com/ubi9/httpd-24
 
-EXPOSE 8080
+USER 0
+COPY --from=0 /gimp-web/output /tmp/src/
+RUN chown -R 1001:0 /tmp/src
 
-USER 1000580000
-ENTRYPOINT ["/usr/bin/run-httpd"]
+USER 1001
+RUN /usr/libexec/s2i/assemble
+CMD /usr/libexec/s2i/run
diff --git a/www.gimp.org/app_data/httpd-cfg/registry.gimp.org.conf 
b/www.gimp.org/app_data/httpd-cfg/registry.gimp.org.conf
index d083f390..5144b335 100644
--- a/www.gimp.org/app_data/httpd-cfg/registry.gimp.org.conf
+++ b/www.gimp.org/app_data/httpd-cfg/registry.gimp.org.conf
@@ -2,10 +2,5 @@
     ServerName registry.gimp.org
 
     RewriteEngine on
-    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge
     RewriteRule ^(.*) https://www.gimp.org/registry$1 [R,L]
 </VirtualHost>
-
-<LocationMatch "^/.well-known/acme-challenge">
-  RedirectMatch ^(.*) https://letsencrypt.gnome.org$1
-</LocationMatch>
diff --git a/www.gimp.org/app_data/httpd-cfg/www.gimp.org.conf 
b/www.gimp.org/app_data/httpd-cfg/www.gimp.org.conf
index 738cd168..2329c038 100644
--- a/www.gimp.org/app_data/httpd-cfg/www.gimp.org.conf
+++ b/www.gimp.org/app_data/httpd-cfg/www.gimp.org.conf
@@ -80,7 +80,3 @@ m; \
 <Directory "/opt/app-root/src/html">
   Require all granted
 </Directory>
-
-<LocationMatch "^/.well-known/acme-challenge">
-  RedirectMatch ^(.*) https://letsencrypt.gnome.org$1
-</LocationMatch>