summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2017-11-14 19:38:24 +0100
committerGitHub <noreply@github.com>2017-11-14 19:38:24 +0100
commit209265104d469028ceaba172930d46dfcc0dc4df (patch)
treed349347428a66bfcd9a8b002caabd3805c376325
parent1f9e1be3562caca016100129a14adf5c8d1efea2 (diff)
downloadbugzilla-209265104d469028ceaba172930d46dfcc0dc4df.tar.gz
bugzilla-209265104d469028ceaba172930d46dfcc0dc4df.tar.xz
no bug - add demo command and allow PORT to be 80 (#271)
-rw-r--r--Dockerfile3
-rwxr-xr-xscripts/entrypoint.pl5
2 files changed, 7 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 4a387f1a2..7de8088be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,8 @@ COPY . .
RUN mv /opt/bmo/local /app && \
chown -R app:app /app && \
- perl -c /app/scripts/entrypoint.pl
+ perl -c /app/scripts/entrypoint.pl && \
+ setcap 'cap_net_bind_service=+ep' /usr/sbin/httpd
USER app
diff --git a/scripts/entrypoint.pl b/scripts/entrypoint.pl
index 40e7cd577..04d442180 100755
--- a/scripts/entrypoint.pl
+++ b/scripts/entrypoint.pl
@@ -34,6 +34,11 @@ check_env() unless $cmd eq 'shell';
$func->(@ARGV);
+sub cmd_demo {
+ cmd_load_test_data() unless -f "/app/data/params";
+ cmd_httpd();
+}
+
sub cmd_httpd {
check_data_dir();
wait_for_db();