update seadoc standalone

haiwen · Sep 10, 2024 · ee021f5 · ee021f5
1 parent d0ad86f
commit ee021f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 17 deletions.
diff --git a/manual/docker/docker-compose/seadoc/1.0/standalone/env b/manual/docker/docker-compose/seadoc/1.0/standalone/env
@@ -3,10 +3,8 @@ COMPOSE_PATH_SEPARATOR=','
 
 
 SEADOC_IMAGE=seafileltd/sdoc-server:1.0-latest
-SEAFILE_CADDY_IMAGE=lucaslorentz/caddy-docker-proxy:2.9
 
 SEADOC_VOLUMES=/opt/seadoc-data
-SEAFILE_CADDY_VOLUMES=/opt/seafile-caddy
 
 SEAFILE_MYSQL_DB_HOST=192.168.0.2
 SEAFILE_MYSQL_DB_USER=seafile
@@ -19,4 +17,4 @@ JWT_PRIVATE_KEY=
 SEAFILE_SERVER_HOSTNAME=example.seafile.com
 SEAFILE_SERVER_PROTOCOL=http
 
-SEADOC_SERVER_URL=http://example.seadoc.com
+SEADOC_SERVER_URL=http://example.seafile.com/sdoc-server
diff --git a/manual/docker/docker-compose/seadoc/1.0/standalone/seadoc.yml b/manual/docker/docker-compose/seadoc/1.0/standalone/seadoc.yml
@@ -5,8 +5,8 @@ services:
     container_name: seadoc
     volumes:
       - ${SEADOC_VOLUMES:-/opt/seadoc-data/}:/shared
-    # ports:
-    #   - "80:80"
+    ports:
+      - "80:80"
     environment:
       - DB_HOST=${SEAFILE_MYSQL_DB_HOST:-db}
       - DB_PORT=${SEAFILE_MYSQL_DB_PORT:-3306}
@@ -16,19 +16,9 @@ services:
       - TIME_ZONE=${TIME_ZONE:-Etc/UTC}
       - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty}
       - SEAHUB_SERVICE_URL=${SEAFILE_SERVER_PROTOCOL:-http}://${SEAFILE_SERVER_HOSTNAME:?Variable is not set or empty}
-    labels:
-      caddy: ${SEADOC_SERVER_URL:?Variable is not set or empty}
-      [email protected]_header: "Connection *Upgrade*"
-      [email protected]_header: "Upgrade websocket"
-      caddy.0_reverse_proxy: "@ws {{upstreams 80}}"
-      caddy.1_handle_path: "/socket.io/*"
-      caddy.1_handle_path.0_rewrite: "* /socket.io{uri}"
-      caddy.1_handle_path.1_reverse_proxy: "{{upstreams 80}}"
-      caddy.2_handle_path: "/sdoc-server/*"
-      caddy.2_handle_path.0_rewrite: "* {uri}"
-      caddy.2_handle_path.1_reverse_proxy: "{{upstreams 80}}"
     networks:
       - seafile-net
 
 networks:
   seafile-net:
+    name: seafile-net
diff --git a/manual/upgrade/upgrade_docker.md b/manual/upgrade/upgrade_docker.md
@@ -114,7 +114,7 @@ The following fields merit particular attention:
 * The volume directory of Caddy data (SEAFILE_CADDY_VOLUMES)
 * The user of MySQL (SEAFILE_MYSQL_DB_USER, `database` - `user` can be found in conf/seafile.conf)
 * The password of MySQL (SEAFILE_MYSQL_DB_PASSWORD, `database` - `password` can be found in seafile.conf)
-* jwt (JWT_PRIVATE_KEY, A random string with a length of no less than 32 characters)
+* jwt (JWT_PRIVATE_KEY, A random string with a length of no less than 32 characters, generate example: `pwgen -s 40 1`)
 * SEAFILE_SERVER_HOSTNAME (SEAFILE_SERVER_HOSTNAME, same as the SEAFILE_SERVER_HOSTNAME in the old docker-compose.yml)
 * SEAFILE_SERVER_PROTOCOL (SEAFILE_SERVER_PROTOCOL, use http or https)