[damned-lies/oscp-testing] Migrate to CentOS 8 + python39

[Andrea Veri <averi src gnome org>]

commit 625b03090958e93ab942d8c2b1b7d1a42da2c8f4
Author: Andrea Veri <averi redhat com>
Date:   Tue Jun 8 13:05:09 2021 +0200

    Migrate to CentOS 8 + python39

 Dockerfile    | 30 +++++++++++++++---------------
 entrypoint.sh |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index 18076789..a9a5d8ea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,36 @@
-FROM centos/s2i-base-centos7
+FROM centos/s2i-base-centos8
 
 USER root
-RUN INSTALL_PKGS="rh-python36 rh-python36-python-devel rh-python36-python-setuptools rh-python36-python-pip 
nss_wrapper rh-python36-mod_wsgi \
-        httpd24 httpd24-httpd-devel httpd24-mod_ssl httpd24-mod_auth_kerb httpd24-mod_ldap \
-        httpd24-mod_session atlas-devel gcc-c++ gcc-gfortran libffi-devel libtool-ltdl enchant wget \
-        gettext gnome-doc-utils intltool itstool libicu-devel mariadb-devel subversion translate-toolkit 
yelp-tools" && \
-    yum install -y centos-release-scl epel-release && \
+RUN INSTALL_PKGS="python39 platform-python-devel platform-python-setuptools python39-pip python39-mod_wsgi 
python39-lxml \
+        httpd httpd-devel mod_ssl mod_ldap mod_session \
+        atlas-devel gcc-c++ gcc-gfortran libffi-devel libtool-ltdl enchant wget \
+        gettext gnome-doc-utils intltool itstool libicu-devel mariadb-devel subversion yelp-tools" && \
+    yum update -y && \
+    yum install -y epel-release && \
     yum -y --setopt=tsflags=nodocs install --enablerepo=centosplus $INSTALL_PKGS && \
     # Remove centos-logos (httpd dependency) to keep image size smaller.
     rpm -e --nodeps centos-logos && \
     yum -y clean all --enablerepo='*'
 
-RUN sed -ri ' s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g;' 
/opt/rh/httpd24/root/etc/httpd/conf/httpd.conf && \
-    sed -ri ' s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; s!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g; 
s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g;' /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf && \
-    rm -f /opt/rh/httpd24/root/etc/httpd/conf.d/mod_security.conf
+RUN sed -ri ' s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g;' 
/etc/httpd/conf/httpd.conf && \
+    sed -ri ' s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; s!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g; 
s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g;' /etc/httpd/conf.d/ssl.conf && \
+    rm -f /etc/httpd/conf.d/mod_security.conf
 
-RUN sed -i 's/Listen\ 80/Listen\ 8080/' /opt/rh/httpd24/root/etc/httpd/conf/httpd.conf && \
-    sed -i 's/Listen\ 443/Listen\ 8443/' /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf && \
-    sed -i 's/_default_:443/_default_:8443/' /opt/rh/httpd24/root/etc/httpd/conf.d/ssl.conf
+RUN sed -i 's/Listen\ 80/Listen\ 8080/' /etc/httpd/conf/httpd.conf && \
+    sed -i 's/Listen\ 443/Listen\ 8443/' /etc/httpd/conf.d/ssl.conf && \
+    sed -i 's/_default_:443/_default_:8443/' etc/httpd/conf.d/ssl.conf
 
 RUN groupadd l10n -g 1000660000 && \
     useradd l10n -g 1000660000 -u 1000660000 -G apache -r -l -m && \
     chown l10n:l10n /etc/pki/tls/certs/localhost.crt /etc/pki/tls/private/localhost.key && \
-    chown l10n:l10n /opt/rh/httpd24/root/var/run/httpd && \
+    chown l10n:l10n /var/run/httpd && \
     mkdir -p /l10n && \
     git clone --depth 1 --branch testing --single-branch 
https://gitlab.gnome.org/Infrastructure/damned-lies.git /l10n/damnedlies
 ADD local_settings.py /l10n/damnedlies/damnedlies/local_settings.py
-ADD l10n-testing.openshift.gnome.org.conf 
/opt/rh/httpd24/root/etc/httpd/conf.d/l10n-testing.openshift.gnome.org.conf
+ADD l10n-testing.openshift.gnome.org.conf /etc/httpd/conf.d/l10n-testing.openshift.gnome.org.conf
 RUN chown -R l10n:l10n /l10n
 
 USER l10n
-SHELL ["/usr/bin/scl", "enable", "rh-python36"]
 WORKDIR /l10n/damnedlies
 RUN virtualenv /l10n/venv && \
     /l10n/venv/bin/pip install -r requirements.txt
diff --git a/entrypoint.sh b/entrypoint.sh
index bbf1cbfe..08645f58 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -15,4 +15,4 @@ echo 'Generating static files'
 echo 'Compiling translations'
 /l10n/venv/bin/python manage.py compile-trans
 
-scl enable rh-python36 httpd24 "$*"
+exec "$*"