From 18754b3a85ed40844a1ddc314abe868b48c7baa6 Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 11 Oct 2022 19:46:53 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- bin/cherokee-server | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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