diff --git a/typecho/caddy/buildx/Caddyfile b/typecho/caddy/buildx/Caddyfile new file mode 100644 index 0000000..9d795ce --- /dev/null +++ b/typecho/caddy/buildx/Caddyfile @@ -0,0 +1,16 @@ +{ + auto_https disable_redirects + email admin@rainss.cn +} +example.com:80 { + encode gzip + root * /www/websites/typecho + php_fastcgi php-fpm:9000 + file_server +} +http://www.example.com { + root * /www/websites/typecho + encode gzip + php_fastcgi php-fpm:9000 + file_server +} \ No newline at end of file diff --git a/typecho/caddy/buildx/Dockerfile b/typecho/caddy/buildx/Dockerfile index f0b6bd3..4827f3d 100644 --- a/typecho/caddy/buildx/Dockerfile +++ b/typecho/caddy/buildx/Dockerfile @@ -4,7 +4,6 @@ FROM --platform=$TARGETPLATFORM 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 ENV BUILD_DEPS \ libzip-dev \ icu-dev \ diff --git a/typecho/docker-compose.yaml b/typecho/docker-compose.yaml index eac6a31..8e28ba5 100644 --- a/typecho/docker-compose.yaml +++ b/typecho/docker-compose.yaml @@ -15,6 +15,8 @@ services: depends_on: - php-cgi restart: unless-stopped + networks: + - website php-cgi: container_name: php-fpm build: @@ -23,18 +25,20 @@ services: volumes: - ${PWD}/caddy/websites:/www/websites restart: unless-stopped - 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 +# 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: