From 8c7081ca33e2e0b27eb4cded56a3e8abc6f6a7ac Mon Sep 17 00:00:00 2001 From: Junxiang Huang Date: Fri, 24 Jan 2025 11:32:38 +0800 Subject: [PATCH 1/2] fix: unhealth status of caddy image --- manual/config/env.md | 4 ++-- manual/repo/docker/caddy.yml | 2 +- manual/repo/docker/ce/env | 2 +- manual/repo/docker/pro/env | 2 +- manual/setup/caddy.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manual/config/env.md b/manual/config/env.md index 92e70bb2..449e51e6 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -11,7 +11,7 @@ SEAFILE_IMAGE=seafileltd/seafile-pro-mc:12.0-latest SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_MEMCACHED_IMAGE=memcached:1.6.29 SEAFILE_ELASTICSEARCH_IMAGE=elasticsearch:8.15.0 # pro edition only -SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9 +SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:ci-alpine SEAFILE_VOLUME=/opt/seafile-data SEAFILE_MYSQL_VOLUME=/opt/seafile-mysql/db @@ -73,7 +73,7 @@ NOTIFICATION_SERVER_VOLUME=/opt/notification-data - `SEAFILE_DB_IMAGE`: Database server image, default is `mariadb:10.11`. - `SEAFILE_MEMCACHED_IMAGE`: Cached server image, default is `memcached:1.6.29` - `SEAFILE_ELASTICSEARCH_IMAGE`: Only valid in pro edition. The elasticsearch image, default is `elasticsearch:8.15.0`. -- `SEAFILE_CADDY_IMAGE`: Caddy server image, default is `lucaslorentz/caddy-docker-proxy:2.9`. +- `SEAFILE_CADDY_IMAGE`: Caddy server image, default is `lucaslorentz/caddy-docker-proxy:ci-alpine`. - `SEADOC_IMAGE`: Only valid after integrating [SeaDoc](../extension/setup_seadoc.md). SeaDoc server image, default is `seafileltd/sdoc-server:1.0-latest`. ### Persistent Volume Configurations diff --git a/manual/repo/docker/caddy.yml b/manual/repo/docker/caddy.yml index 3bf7e731..3c8d6aea 100644 --- a/manual/repo/docker/caddy.yml +++ b/manual/repo/docker/caddy.yml @@ -1,7 +1,7 @@ services: caddy: - image: ${SEAFILE_CADDY_IMAGE:-lucaslorentz/caddy-docker-proxy:2.9} + image: ${SEAFILE_CADDY_IMAGE:-lucaslorentz/caddy-docker-proxy:ci-alpine} restart: unless-stopped container_name: seafile-caddy ports: diff --git a/manual/repo/docker/ce/env b/manual/repo/docker/ce/env index 58501e7b..394af493 100644 --- a/manual/repo/docker/ce/env +++ b/manual/repo/docker/ce/env @@ -5,7 +5,7 @@ COMPOSE_PATH_SEPARATOR=',' SEAFILE_IMAGE=seafileltd/seafile-mc:12.0-latest SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_MEMCACHED_IMAGE=memcached:1.6.29 -SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9 +SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:ci-alpine SEAFILE_VOLUME=/opt/seafile-data SEAFILE_MYSQL_VOLUME=/opt/seafile-mysql/db diff --git a/manual/repo/docker/pro/env b/manual/repo/docker/pro/env index 7179c669..f99ac9c9 100644 --- a/manual/repo/docker/pro/env +++ b/manual/repo/docker/pro/env @@ -8,7 +8,7 @@ SEAFILE_IMAGE=seafileltd/seafile-pro-mc:12.0-latest SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_MEMCACHED_IMAGE=memcached:1.6.29 SEAFILE_ELASTICSEARCH_IMAGE=elasticsearch:8.15.0 -SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9 +SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:ci-alpine ## Persistent Storage SEAFILE_VOLUME=/opt/seafile-data diff --git a/manual/setup/caddy.md b/manual/setup/caddy.md index 7374486b..d015348b 100644 --- a/manual/setup/caddy.md +++ b/manual/setup/caddy.md @@ -1,7 +1,7 @@ # HTTPS and Caddy !!! note - From Seafile Docker 12.0, HTTPS will be handled by the [***Caddy***](https://caddyserver.com/docs/). The default caddy image used of Seafile docker is [`lucaslorentz/caddy-docker-proxy:2.9`](https://github.com/lucaslorentz/caddy-docker-proxy). + From Seafile Docker 12.0, HTTPS will be handled by the [***Caddy***](https://caddyserver.com/docs/). The default caddy image used of Seafile docker is [`lucaslorentz/caddy-docker-proxy:ci-alpine`](https://github.com/lucaslorentz/caddy-docker-proxy). Caddy is a modern open source web server that mainly binds external traffic and internal services in [seafile docker](./overview.md). In addition to the advantages of traditional proxy components (e.g., *nginx*), Caddy also makes it easier for users to complete the acquisition and update of HTTPS certificates by providing simpler configurations. From 4d8836ad75cc89b1d0cc85e0643eec60f4668985 Mon Sep 17 00:00:00 2001 From: Junxiang Huang Date: Fri, 24 Jan 2025 13:56:11 +0800 Subject: [PATCH 2/2] fix: unhealth status of caddy image --- manual/config/env.md | 4 ++-- manual/repo/docker/caddy.yml | 2 +- manual/repo/docker/ce/env | 2 +- manual/repo/docker/pro/env | 2 +- manual/setup/caddy.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manual/config/env.md b/manual/config/env.md index 449e51e6..f45dc718 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -11,7 +11,7 @@ SEAFILE_IMAGE=seafileltd/seafile-pro-mc:12.0-latest SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_MEMCACHED_IMAGE=memcached:1.6.29 SEAFILE_ELASTICSEARCH_IMAGE=elasticsearch:8.15.0 # pro edition only -SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:ci-alpine +SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9-alpine SEAFILE_VOLUME=/opt/seafile-data SEAFILE_MYSQL_VOLUME=/opt/seafile-mysql/db @@ -73,7 +73,7 @@ NOTIFICATION_SERVER_VOLUME=/opt/notification-data - `SEAFILE_DB_IMAGE`: Database server image, default is `mariadb:10.11`. - `SEAFILE_MEMCACHED_IMAGE`: Cached server image, default is `memcached:1.6.29` - `SEAFILE_ELASTICSEARCH_IMAGE`: Only valid in pro edition. The elasticsearch image, default is `elasticsearch:8.15.0`. -- `SEAFILE_CADDY_IMAGE`: Caddy server image, default is `lucaslorentz/caddy-docker-proxy:ci-alpine`. +- `SEAFILE_CADDY_IMAGE`: Caddy server image, default is `lucaslorentz/caddy-docker-proxy:2.9-alpine`. - `SEADOC_IMAGE`: Only valid after integrating [SeaDoc](../extension/setup_seadoc.md). SeaDoc server image, default is `seafileltd/sdoc-server:1.0-latest`. ### Persistent Volume Configurations diff --git a/manual/repo/docker/caddy.yml b/manual/repo/docker/caddy.yml index 3c8d6aea..2321ed16 100644 --- a/manual/repo/docker/caddy.yml +++ b/manual/repo/docker/caddy.yml @@ -1,7 +1,7 @@ services: caddy: - image: ${SEAFILE_CADDY_IMAGE:-lucaslorentz/caddy-docker-proxy:ci-alpine} + image: ${SEAFILE_CADDY_IMAGE:-lucaslorentz/caddy-docker-proxy:2.9-alpine} restart: unless-stopped container_name: seafile-caddy ports: diff --git a/manual/repo/docker/ce/env b/manual/repo/docker/ce/env index 394af493..4d77ed00 100644 --- a/manual/repo/docker/ce/env +++ b/manual/repo/docker/ce/env @@ -5,7 +5,7 @@ COMPOSE_PATH_SEPARATOR=',' SEAFILE_IMAGE=seafileltd/seafile-mc:12.0-latest SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_MEMCACHED_IMAGE=memcached:1.6.29 -SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:ci-alpine +SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9-alpine SEAFILE_VOLUME=/opt/seafile-data SEAFILE_MYSQL_VOLUME=/opt/seafile-mysql/db diff --git a/manual/repo/docker/pro/env b/manual/repo/docker/pro/env index f99ac9c9..90a45351 100644 --- a/manual/repo/docker/pro/env +++ b/manual/repo/docker/pro/env @@ -8,7 +8,7 @@ SEAFILE_IMAGE=seafileltd/seafile-pro-mc:12.0-latest SEAFILE_DB_IMAGE=mariadb:10.11 SEAFILE_MEMCACHED_IMAGE=memcached:1.6.29 SEAFILE_ELASTICSEARCH_IMAGE=elasticsearch:8.15.0 -SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:ci-alpine +SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9-alpine ## Persistent Storage SEAFILE_VOLUME=/opt/seafile-data diff --git a/manual/setup/caddy.md b/manual/setup/caddy.md index d015348b..04d25d7e 100644 --- a/manual/setup/caddy.md +++ b/manual/setup/caddy.md @@ -1,7 +1,7 @@ # HTTPS and Caddy !!! note - From Seafile Docker 12.0, HTTPS will be handled by the [***Caddy***](https://caddyserver.com/docs/). The default caddy image used of Seafile docker is [`lucaslorentz/caddy-docker-proxy:ci-alpine`](https://github.com/lucaslorentz/caddy-docker-proxy). + From Seafile Docker 12.0, HTTPS will be handled by the [***Caddy***](https://caddyserver.com/docs/). The default caddy image used of Seafile docker is [`lucaslorentz/caddy-docker-proxy:2.9-alpine`](https://github.com/lucaslorentz/caddy-docker-proxy). Caddy is a modern open source web server that mainly binds external traffic and internal services in [seafile docker](./overview.md). In addition to the advantages of traditional proxy components (e.g., *nginx*), Caddy also makes it easier for users to complete the acquisition and update of HTTPS certificates by providing simpler configurations.