diff --git a/Dockerfile b/Dockerfile index fabeac6..30af25c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM casjaysdevdocker/python2:latest AS build -ARG PORTS="80 443 9090" +ARG PORTS="80 9090" ENV CFLAGS="-static" diff --git a/bin/cherokee-server b/bin/cherokee-server index f034604..575bb94 100755 --- a/bin/cherokee-server +++ b/bin/cherokee-server @@ -30,10 +30,13 @@ if [ ! -f "/config/ssl//localhost.crt" ] || [ ! -f "/config/ssl//localhost.key" create-ssl-cert fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -php-fpm-server +# Start php-fpm server +php-fpm-server & # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if [ ! -f "/tmp/cherokee.pid" ]; then + echo "Starting cherokee-admin on port 9090" cherokee-admin -b -p 9090 -C /etc/cherokee/cherokee.conf & + echo "Starting cherokee webserver on port 80" exec cherokee -C /etc/cherokee/cherokee.conf || rm -Rf "/tmp/cherokee.pid" fi