Use Upstream Container Images

Dockerfile

@@ -1,28 +1,17 @@
-FROM fedora:34 as builder
+FROM python:3 AS builder
 
-COPY . /code
 WORKDIR /code
 
-RUN dnf -y install gettext python3-setuptools python3-pyyaml python3-mako python3-babel python3-pygraphviz && dnf clean all && python3 setup.py install && ./build.sh
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
 
-FROM fedora:34
+COPY . .
 
-COPY --from=builder /code/build /var/www/html/
-COPY --from=builder /code/container/l10n.conf /etc/httpd/conf/l10n.conf
-COPY container/favicon.xpm /var/www/html/static/image/favicon.xpm
-COPY container/whatcanidoforfedora-web.conf /etc/httpd/conf/httpd.conf
-RUN dnf -y install httpd && dnf clean all\
-    && chown apache:0 /etc/httpd/conf/httpd.conf \
-    && chmod g+r /etc/httpd/conf/httpd.conf \
-    && chown apache:0 /etc/httpd/conf/l10n.conf \
-    && chmod g+r /etc/httpd/conf/l10n.conf \
-    && chown apache:0 /var/log/httpd  \
-    && chmod g+rwX /var/log/httpd \
-    && chown apache:0 /var/run/httpd \
-    && chmod g+rwX /var/run/httpd\
-    && chown -R apache:0 /var/www/html \
-    && chmod -R g+rwX /var/www/html
-EXPOSE 8080
-USER apache
-ADD container/container-entrypoint.sh /srv
-ENTRYPOINT ["bash", "/srv/container-entrypoint.sh"]
+RUN ./build.sh
+
+FROM httpd:2.4
+
+COPY --from=builder /code/build /usr/local/apache2/htdocs/
+COPY --from=builder /code/container/l10n.conf /usr/local/apache2/conf/l10n.conf
+COPY container/favicon.xpm /usr/local/apache2/htdocs/static/image/favicon.xpm
+COPY container/whatcanidoforfedora-web.conf /usr/local/apache2/conf/httpd.conf

README.md

@@ -111,11 +111,7 @@ podman-compose up -d
 
 ###### Verifiying
 
-In your Favorite Browser Just type:
-
-```
- localhost:8080
-```
+In your favorite browser navigate to [localhost:8080](http://localhost:8080).
 
 ## Application Deployment