From 8dceb98c562c2ee827575880ddedf3a431c1dcf3 Mon Sep 17 00:00:00 2001
From: filesite <release@filesite.io>
Date: Mon, 24 Oct 2022 22:37:07 +0800
Subject: [PATCH] Dockerfile update

---
 Dockerfile           | 18 +++++++++++++-----
 docker-entrypoint.sh |  7 ++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2061015..5556287 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,22 @@
-FROM alpine
-RUN apk add php8-fpm nginx && \
-    mkdir -p /var/www/downloads && cd /var/www/downloads/ && \
+FROM php:8.1.12RC1-fpm-alpine3.16
+RUN apk add \
+    nginx zlib-dev libpng-dev freetype-dev libjpeg-turbo-dev \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) gd \
+    && mkdir -p /var/www/downloads && cd /var/www/downloads/ && \
     wget "https://git.filesite.io/filesite/machete/archive/master.tar.gz" && \
     tar -zxvf master.tar.gz && \
     mv machete/ /var/www/ && \
     cd /var/www/ && rm -rf downloads/ && \
+    mkdir machete/www/navs/ && mkdir machete/www/girls/ && mkdir machete/www/videos/ && \
     rm -f /etc/nginx/http.d/default.conf && \
     cp /var/www/machete/conf/nginx_machete.conf /etc/nginx/http.d/machete.conf
 
 EXPOSE 80/tcp
 ENTRYPOINT ["/var/www/machete/docker-entrypoint.sh"]
-## 默认使用导航站皮肤：webdirectory
-CMD ["webdirectory"]
+# 默认使用导航站皮肤：manual
+CMD ["manual"]
+
+
+# build command
+# docker build --no-cache -t filesite/machete .
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 64c3482..5e7e893 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -14,8 +14,9 @@ cp "template_${theme}.php" app.php
 
 ## 启动nginx和php-fpm
 if [ -e /usr/sbin/nginx ]; then
+    echo "Start nginx."
     /usr/sbin/nginx
 fi
-if [ -e /usr/sbin/php-fpm8 ]; then
-    /usr/sbin/php-fpm8 -F
-fi
+
+echo "Start php-fpm."
+php-fpm -F