From edfd79827ac1208aa5a96624da33ff2bd15967f0 Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Sep 13 2019 10:50:06 +0000
Subject: Fix up dockerfile and make it better for development purposes


Signed-off-by: Rick Elrod <rick@elrod.me>

---

diff --git a/Dockerfile b/Dockerfile
index c65e678..7aecbb3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,26 @@
-FROM fedora:latest as builder
-
-COPY sites /sites
-WORKDIR /sites
-
-RUN dnf -y install python-flask python-frozen-flask python-flask-assets python-rjsmin python-cssmin python-flask-babel python-flask-htmlmin python-cssutils rubygem-sass babel python3-jinja2 python-pyyaml python-zanata-client \
-    && dnf clean all \
-    && mkdir /built \
-    && cd getfedora.org && ./scripts/pull-translations.sh \
-    && python main.py && mv build /built/getfedora.org
-#    && cd getfedora.org && python main.py && mv build /built/getfedora.org
-#     ...
-
 FROM fedora:latest
 
-COPY --from=builder /built/ /var/www/html/
-COPY container/conf.d/*.conf /etc/httpd/conf.d/
-COPY container/httpd.conf /etc/httpd/conf/httpd.conf
+WORKDIR /opt/sites/getfedora.org/
+
+RUN dnf -y install \
+    python-flask \
+    python-frozen-flask \
+    python-flask-assets \
+    python-rjsmin \
+    python-cssmin \
+    python-flask-babel \
+    python-flask-htmlmin \
+    python-cssutils \
+    rubygem-sass \
+    babel \
+    python3-jinja2 \
+    python-pyyaml \
+    python-dateutil \
+    python-dogpile-cache \
+    python-requests \
+    python-zanata-client && \
+      dnf clean all
 
-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 /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
+ENV FLASK_APP main.py
 
-EXPOSE 8080
-USER apache
-ENTRYPOINT httpd -DFOREGROUND -DNO_DETACH
+EXPOSE 5000