Merge pull request #452 from haiwen/deploy-seafile-seadoc-together-default

Seadoc deployed with Docker deployment with Seafile

manual/extension/setup_seadoc.md

@@ -31,6 +31,11 @@ Here is the workflow when a user open sdoc file in browser
 
 ## Deployment SeaDoc
 
+!!! success "Default extension in Docker deployment"
+    This extension is already installed by default when deploying Seafile (single-node mode) by [Docker](../setup/setup_ce_by_docker.md). 
+
+    If you would like to remove it, you can undo the steps in this section (i.e., remove the `seadoc.yml` in the field `COMPOSE_FILE` and set `ENABLE_SEADOC` to `false`) 
+
 The easiest way to deployment SeaDoc is to deploy it with Seafile server on the same host using the same Docker network. If in some situations, you need to deployment SeaDoc standalone, you can follow the next section.
 
 1. Download the `seadoc.yml` to `/opt/seafile`

manual/repo/docker/ce/env

@@ -1,4 +1,4 @@
-COMPOSE_FILE='seafile-server.yml,caddy.yml'
+COMPOSE_FILE='seafile-server.yml,caddy.yml,seadoc.yml'
 COMPOSE_PATH_SEPARATOR=','
 
 
@@ -30,8 +30,7 @@ INIT_SEAFILE_ADMIN_PASSWORD=asecret
 SEADOC_IMAGE=seafileltd/sdoc-server:1.0-latest
 SEADOC_VOLUME=/opt/seadoc-data
 
-ENABLE_SEADOC=false
-SEADOC_SERVER_URL=http://seafile.example.com/sdoc-server
+ENABLE_SEADOC=true
 
 
 NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest

manual/repo/docker/ce/seafile-server.yml

@@ -56,8 +56,8 @@ services:
       - NON_ROOT=${NON_ROOT:-false}
       - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty}
       - SEAFILE_LOG_TO_STDOUT=${SEAFILE_LOG_TO_STDOUT:-false}
-      - ENABLE_SEADOC=${ENABLE_SEADOC:-false}
-      - SEADOC_SERVER_URL=${SEADOC_SERVER_URL:-http://seafile.example.com/sdoc-server}
+      - ENABLE_SEADOC=${ENABLE_SEADOC:-true}
+      - SEADOC_SERVER_URL=${SEAFILE_SERVER_PROTOCOL:-http}://${SEAFILE_SERVER_HOSTNAME:?Variable is not set or empty}/sdoc-server
     labels:
       caddy: ${SEAFILE_SERVER_PROTOCOL:-http}://${SEAFILE_SERVER_HOSTNAME:?Variable is not set or empty}
       caddy.reverse_proxy: "{{upstreams 80}}"

manual/repo/docker/pro/env

@@ -1,4 +1,4 @@
-COMPOSE_FILE='seafile-server.yml,caddy.yml'
+COMPOSE_FILE='seafile-server.yml,caddy.yml,seadoc.yml'
 COMPOSE_PATH_SEPARATOR=','
 
 # Seafile & Basic services
@@ -51,10 +51,9 @@ INIT_S3_HOST=s3.us-east-1.amazonaws.com
 INIT_S3_USE_HTTPS=true
 
 # SeaDoc service
-ENABLE_SEADOC=false
+ENABLE_SEADOC=true
 SEADOC_IMAGE=seafileltd/sdoc-server:1.0-latest
 SEADOC_VOLUME=/opt/seadoc-data
-SEADOC_SERVER_URL=http://seafile.example.com/sdoc-server
 
 # Notification server
 NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest

manual/repo/docker/pro/seafile-server.yml

@@ -74,8 +74,8 @@ services:
       - NON_ROOT=${NON_ROOT:-false}
       - JWT_PRIVATE_KEY=${JWT_PRIVATE_KEY:?Variable is not set or empty}
       - SEAFILE_LOG_TO_STDOUT=${SEAFILE_LOG_TO_STDOUT:-false}
-      - ENABLE_SEADOC=${ENABLE_SEADOC:-false}
-      - SEADOC_SERVER_URL=${SEADOC_SERVER_URL:-http://seafile.example.com/sdoc-server}
+      - ENABLE_SEADOC=${ENABLE_SEADOC:-true}
+      - SEADOC_SERVER_URL=${SEAFILE_SERVER_PROTOCOL:-http}://${SEAFILE_SERVER_HOSTNAME:?Variable is not set or empty}/sdoc-server
       - INIT_S3_STORAGE_BACKEND_CONFIG=${INIT_S3_STORAGE_BACKEND_CONFIG:-false}
       - INIT_S3_COMMIT_BUCKET=${INIT_S3_COMMIT_BUCKET:-}
       - INIT_S3_FS_BUCKET=${INIT_S3_FS_BUCKET:-}

manual/setup/setup_ce_by_docker.md

@@ -26,6 +26,7 @@ cd /opt/seafile
 
 # Seafile CE 12.0
 wget -O .env https://manual.seafile.com/12.0/repo/docker/ce/env
+wget https://manual.seafile.com/12.0/repo/docker/seadoc.yml
 wget https://manual.seafile.com/12.0/repo/docker/ce/seafile-server.yml
 wget https://manual.seafile.com/12.0/repo/docker/caddy.yml
 

manual/setup/setup_pro_by_docker.md

@@ -63,6 +63,7 @@ cd /opt/seafile
 
 # Seafile PE 12.0
 wget -O .env https://manual.seafile.com/12.0/repo/docker/pro/env
+wget https://manual.seafile.com/12.0/repo/docker/seadoc.yml
 wget https://manual.seafile.com/12.0/repo/docker/pro/seafile-server.yml
 wget https://manual.seafile.com/12.0/repo/docker/caddy.yml