[damned-lies/oscp] fix: replace old centos8 by fedora 34 for image

[Guillaume Bernard <gbernard src gnome org>]

commit 92b05119a79e922628abf7437b41b3bddcc2d3f7
Author: Guillaume Bernard <associations guillaume-bernard fr>
Date:   Thu Apr 28 17:17:36 2022 +0200

    fix: replace old centos8 by fedora 34 for image
    
    - this fixes a bug that needed an updated version of gettext

 httpd/Dockerfile | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)
---
diff --git a/httpd/Dockerfile b/httpd/Dockerfile
index 3c8e8ada..9924fae6 100644
--- a/httpd/Dockerfile
+++ b/httpd/Dockerfile
@@ -1,38 +1,37 @@
-FROM centos/s2i-base-centos8
+FROM fedora:34
 
+ENV USER=l10n
 USER root
-RUN INSTALL_PKGS="python39 python39-devel python39-setuptools python39-pip python39-mod_wsgi python39-lxml \
+
+RUN INSTALL_PKGS="python python-devel python-setuptools python-pip python-lxml mod_wsgi \
         httpd httpd-devel mod_ldap mod_session \
-        atlas-devel gcc-c++ gcc-gfortran libffi-devel libtool-ltdl enchant wget python3-libxml2 git \
+        atlas-devel gcc-c++ gcc-gfortran libffi-devel libtool-ltdl enchant wget git \
         gettext gnome-doc-utils intltool itstool libicu-devel mariadb-devel subversion yelp-tools \
         automake autoconf make diffutils glibc-langpack-en" && \
-    yum update -y && \
-    yum install -y epel-release && \
-    yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
-    yum -y clean all --enablerepo='*'
+    dnf update -y && \
+    dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
+    dnf -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;' 
/etc/httpd/conf/httpd.conf && \
+    sed -i 's/Listen\ 80/Listen\ 8080/' /etc/httpd/conf/httpd.conf && \
     rm -f /etc/httpd/conf.d/mod_security.conf
 
-RUN sed -i 's/Listen\ 80/Listen\ 8080/' /etc/httpd/conf/httpd.conf
+RUN groupadd "${USER}" -g 1000660000 && \
+    useradd "${USER}" -g 1000660000 -u 1000660000 -G apache -r -l -m && \
+    chown "${USER}":"${USER}" /var/run/httpd
 
-RUN groupadd l10n -g 1000660000 && \
-    useradd l10n -g 1000660000 -u 1000660000 -G apache -r -l -m && \
-    chown l10n:l10n /var/run/httpd && \
-    mkdir -p /l10n && \
+RUN mkdir -p /l10n && \
     git clone --depth 1 --branch master --single-branch 
https://gitlab.gnome.org/Infrastructure/damned-lies.git /l10n/damnedlies
+
 ADD local_settings.py /l10n/damnedlies/damnedlies/local_settings.py
-ADD l10n.gnome.org.conf /etc/httpd/conf.d/l10n.gnome.org.conf
-RUN chown -R l10n:l10n /l10n
+ADD l10n*.gnome.org.conf /etc/httpd/conf.d/l10n.gnome.org.conf
+ADD entrypoint.sh /entrypoint.sh
 
-RUN ln -s /usr/lib64/python3.6/site-packages/libxml2.py /usr/lib64/python3.9/site-packages/libxml2.py && \
-    ln -s /usr/lib64/python3.6/site-packages/drv_libxml2.py 
/usr/lib64/python3.9/site-packages/drv_libxml2.py && \
-    ln -s /usr/lib64/python3.6/site-packages/libxml2mod.so /usr/lib64/python3.9/site-packages/libxml2mod.so
+RUN chown -R "${USER}":"${USER}" /l10n && chown -R "${USER}":"${USER}" /etc/httpd && chmod o+rx 
/entrypoint.sh
 
 USER l10n
+
 WORKDIR /l10n/damnedlies
-RUN python3.9 -m venv /l10n/venv && \
-    /l10n/venv/bin/pip install -r requirements.txt
+RUN python3 -m venv /l10n/venv && /l10n/venv/bin/pip install -r requirements.txt
 
-ADD entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]