[damned-lies/oscp] Tests done, load the app using httpd



commit 94658946b3718588220fd52cb27e2aa8f506a707
Author: Andrea Veri <averi redhat com>
Date:   Wed Sep 11 18:54:11 2019 +0200

    Tests done, load the app using httpd

 Dockerfile                        | 2 ++
 entrypoint.sh                     | 2 +-
 httpd.conf => l10n.gnome.org.conf | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/Dockerfile b/Dockerfile
index 5a9bf403..a4171568 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,6 +19,7 @@ RUN groupadd l10n -g 1000620000 && \
     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 /opt/rh/httpd24/root/etc/httpd/conf.d/l10n.gnome.org.conf
 RUN chown -R l10n:l10n /l10n
 
 USER l10n
@@ -29,3 +30,4 @@ RUN virtualenv /l10n/venv && \
 
 ADD entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
+CMD ["httpd", "-DFOREGROUND"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 550ada91..3d76a2d5 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -9,4 +9,4 @@ sed -i "s/\$SENTRY_DSN/${SENTRY_DSN}/" /l10n/damnedlies/damnedlies/local_setting
 sed -i "s/\$GITLAB_TOKEN/${GITLAB_TOKEN}/" /l10n/damnedlies/damnedlies/local_settings.py
 
 /l10n/venv/bin/python manage.py collectstatic
-scl enable rh-python36 httpd24 "/l10n/venv/bin/python /l10n/damnedlies/manage.py runserver 0.0.0.0:8000" 
+scl enable rh-python36 httpd24 "$@"
diff --git a/httpd.conf b/l10n.gnome.org.conf
similarity index 100%
rename from httpd.conf
rename to l10n.gnome.org.conf


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]