From 959585da78912396ed84a42079cd4f448df4d377 Mon Sep 17 00:00:00 2001
From: luming <lm@rainss.cn>
Date: Thu, 11 Jan 2024 16:39:32 +0800
Subject: [PATCH] add dependency.

---
 typecho/Dockerfile          | 24 ++++++++++++++----------
 typecho/docker-compose.yaml | 24 +++++-------------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/typecho/Dockerfile b/typecho/Dockerfile
index 0c45eeb..586e87b 100644
--- a/typecho/Dockerfile
+++ b/typecho/Dockerfile
@@ -4,7 +4,7 @@ FROM php:8.1.15-fpm-alpine3.17
 MAINTAINER rainerosion "admin@rainss.cn"
 
 COPY --from=composer-build /usr/bin/composer /usr/bin/composer
-COPY Caddyfile /etc/caddy/Caddyfile
+# build dependencies
 ENV BUILD_DEPS \
     libzip-dev \
     icu-dev \
@@ -16,8 +16,9 @@ ENV BUILD_DEPS \
     sqlite-dev \
     oniguruma-dev \
     libmemcached-dev \
-    zlib-dev
-
+    zlib-dev \
+    imagemagick-dev
+# runtime dependencies
 ENV RUN_DEPS \
     autoconf \
     g++ \
@@ -33,8 +34,9 @@ ENV RUN_DEPS \
     oniguruma \
     libmemcached \
     shadow \
-    zlib
-
+    zlib \
+    imagemagick
+# php extensions
 ENV PHP_EXTENSIONS \
     zip \
     intl \
@@ -48,20 +50,22 @@ ENV PHP_EXTENSIONS \
     session \
     pdo_sqlite \
     fileinfo \
-    mbstring
-
+    mbstring \
+    bcmath
 # set default uid and gid for www-data
 ARG UID=1000
 ARG GUID=1000
+# fpm user
+ARG USER=www-data
 RUN set -eux && \
     sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories && \
     apk update && \
     apk add --no-cache $RUN_DEPS && \
-    usermod -u $UID -o www-data && \
-    groupmod -g $GUID -o www-data && \
+    usermod -u $UID -o $USER && \
+    groupmod -g $GUID -o $USER && \
     apk add --no-cache --virtual .build-deps $BUILD_DEPS && \
     docker-php-ext-configure gd --enable-gd --with-jpeg --with-webp && \
     docker-php-ext-install -j $(nproc) $PHP_EXTENSIONS && \
     pecl install redis memcached  && \
-    docker-php-ext-enable redis memcached && \
+    docker-php-ext-enable redis memcached imagick && \
     apk del .build-deps
\ No newline at end of file
diff --git a/typecho/docker-compose.yaml b/typecho/docker-compose.yaml
index 8e28ba5..5b351fa 100644
--- a/typecho/docker-compose.yaml
+++ b/typecho/docker-compose.yaml
@@ -6,12 +6,11 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "443:443/udp"
     volumes:
-      - ${PWD}/caddy/Caddyfile:/etc/caddy/Caddyfile
-      - ${PWD}/caddy/config:/config
-      - ${PWD}/caddy/data:/data
-      - ${PWD}/caddy/websites:/www/websites
+      - ./Caddyfile:/etc/caddy/Caddyfile
+      - ./config:/config
+      - ./data:/data
+      - ./websites:/www/websites
     depends_on:
       - php-cgi
     restart: unless-stopped
@@ -23,22 +22,9 @@ services:
       context: .
       dockerfile: Dockerfile
     volumes:
-      - ${PWD}/caddy/websites:/www/websites
+      - ./websites:/www/websites
     restart: unless-stopped
     networks:
       - website
-#  pgsql:
-#    container_name: timemail-pgsql
-#    image: postgres:12.4
-#    restart: unless-stopped
-#    environment:
-#      - POSTGRES_PASSWORD=rains.wiki
-#      - ALLOW_IP_RANGE=0.0.0.0/0
-#    ports:
-#      - 5432:5432
-#    volumes:
-#      - ${PWD}/caddy/postgres/data:/var/lib/postgresql
-#    networks:
-#      - website
 networks:
   website: