From f79b81dba1aa16e2c6bb3174ed2f37e2dd44a65a Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Tue, 11 Oct 2022 16:22:27 -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 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5891937..f1b6c6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,11 +21,12 @@ RUN apk -U upgrade && \
   geoip-dev \
   php8-cgi
 
-RUN git clone https://github.com/cherokee/webserver.git . && \
+RUN cd /tmp/build && \
+  git clone https://github.com/cherokee/webserver.git . && \
   libtoolize --force && \
-  ./autogen.sh --prefix=/usr/local/share/cherokee && \
-  ./configure CFLAGS="-static" --prefix=/usr/local/share/cherokee --enable-static-module=all && \
-  make LDFLAGS="-all-static" && make install && \
+  ./autogen.sh --with-python2=/usr/bin/python2 --prefix=/usr/local/share/cherokee && \
+  ./configure CFLAGS="-static" --prefix=/usr/local/share/cherokee --enable-static-module=all --with-wwwroot=/data/htdocs/www && \
+  make && make install && \
   echo "<p style='text-align:center'>Built from $(git rev-parse --short HEAD) on $(date)</p>" > ./version.txt && \
   apk del --no-cache \
   alpine-sdk \
@@ -37,9 +38,10 @@ RUN git clone https://github.com/cherokee/webserver.git . && \
   ffmpeg-dev \
   geoip-dev \
   libtool && \
+  ln -sf /usr/local/share/cherokee/bin/* /usr/local/bin/ && \
   mkdir -p /buildroot && \
   cp -Rf "/usr/local/." "/buildroot/" && \
-  rm -Rf /var/cache/apk/* /tmp/* /var/tmp/* /usr/src/*
+  rm -Rf /var/cache/apk/* /tmp/* /var/tmp/* /tmp/build /usr/src/*
 
 FROM casjaysdevdocker/php:latest AS source