[damned-lies/oscp] Has to happen on dockerfile due to root permissions required



commit 050673ef758ee4067c049b69b37ddb2e756ab092
Author: Andrea Veri <averi redhat com>
Date:   Wed Sep 11 19:16:42 2019 +0200

    Has to happen on dockerfile due to root permissions required

 Dockerfile    | 3 +++
 entrypoint.sh | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index edf9ad28..17776149 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,9 @@ RUN INSTALL_PKGS="rh-python36 rh-python36-python-devel rh-python36-python-setupt
 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
 
+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
+
 RUN groupadd l10n -g 1000620000 && \
     useradd l10n -g 1000620000 -u 1000620000 -G apache -r -l && \
     mkdir -p /l10n && \
diff --git a/entrypoint.sh b/entrypoint.sh
index 47013b62..a9e11b6d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -8,9 +8,5 @@ sed -i "s/\$SECRET_KEY/${SECRET_KEY}/" /l10n/damnedlies/damnedlies/local_setting
 sed -i "s/\$SENTRY_DSN/${SENTRY_DSN}/" /l10n/damnedlies/damnedlies/local_settings.py
 sed -i "s/\$GITLAB_TOKEN/${GITLAB_TOKEN}/" /l10n/damnedlies/damnedlies/local_settings.py
 
-echo 'Allowing non-root httpd runs'
-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
-
 /l10n/venv/bin/python manage.py collectstatic
 scl enable rh-python36 httpd24 "httpd -DFOREGROUND" 


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