From 7b4dba33b36660428db85aaa30f0b0842a27be77 Mon Sep 17 00:00:00 2001 From: skywalker Date: Tue, 12 Nov 2024 14:25:21 +0800 Subject: [PATCH] pro push to docker hub and rm docker.seadrive.org url --- manual/config/env.md | 8 ++++++-- manual/docker/cluster/env | 2 +- manual/docker/cluster/seafile-server.yml | 2 +- manual/docker/pro/env | 2 +- manual/docker/pro/seafile-server.yml | 2 +- manual/setup/cluster_deploy_with_docker.md | 5 +---- manual/setup/cluster_deploy_with_k8s.md | 4 ++-- manual/setup/seafile_docker_autostart.md | 2 +- manual/setup/setup_pro_by_docker.md | 5 +---- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/manual/config/env.md b/manual/config/env.md index 53cb9659..51b56208 100644 --- a/manual/config/env.md +++ b/manual/config/env.md @@ -7,7 +7,7 @@ COMPOSE_FILE='seafile-server.yml,caddy.yml' COMPOSE_PATH_SEPARATOR=',' -SEAFILE_IMAGE=docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest +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 @@ -54,6 +54,10 @@ SEADOC_VOLUME=/opt/seadoc-data ENABLE_SEADOC=false SEADOC_SERVER_URL=http://example.seafile.com/sdoc-server + + +NOTIFICATION_SERVER_IMAGE=seafileltd/notification-server:12.0-latest +NOTIFICATION_SERVER_VOLUME=/opt/notification-data ``` ## Seafile-docker configurations @@ -65,7 +69,7 @@ SEADOC_SERVER_URL=http://example.seafile.com/sdoc-server ### Docker images configurations -- `SEAFILE_IMAGE`: The image of Seafile-server, default is `docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest`. +- `SEAFILE_IMAGE`: The image of Seafile-server, default is `seafileltd/seafile-pro-mc:12.0-latest`. - `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`. diff --git a/manual/docker/cluster/env b/manual/docker/cluster/env index 40e61383..c80d442c 100644 --- a/manual/docker/cluster/env +++ b/manual/docker/cluster/env @@ -1,6 +1,6 @@ COMPOSE_FILE='seafile-server.yml' COMPOSE_PATH_SEPARATOR=',' -SEAFILE_IMAGE=docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest +SEAFILE_IMAGE=seafileltd/seafile-pro-mc:12.0-latest SEAFILE_VOLUME=/opt/seafile/shared SEAFILE_SERVER_HOSTNAME=seafile.example.com SEAFILE_SERVER_PROTOCOL=http diff --git a/manual/docker/cluster/seafile-server.yml b/manual/docker/cluster/seafile-server.yml index a0dd2940..52b8d651 100644 --- a/manual/docker/cluster/seafile-server.yml +++ b/manual/docker/cluster/seafile-server.yml @@ -1,6 +1,6 @@ services: seafile: - image: ${SEAFILE_IMAGE:-docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest} + image: ${SEAFILE_IMAGE:-seafileltd/seafile-pro-mc:12.0-latest} container_name: seafile ports: - 80:80 diff --git a/manual/docker/pro/env b/manual/docker/pro/env index 2e5e8e34..1e667877 100644 --- a/manual/docker/pro/env +++ b/manual/docker/pro/env @@ -2,7 +2,7 @@ COMPOSE_FILE='seafile-server.yml,caddy.yml' COMPOSE_PATH_SEPARATOR=',' -SEAFILE_IMAGE=docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest +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 diff --git a/manual/docker/pro/seafile-server.yml b/manual/docker/pro/seafile-server.yml index 03870314..440b7418 100644 --- a/manual/docker/pro/seafile-server.yml +++ b/manual/docker/pro/seafile-server.yml @@ -37,7 +37,7 @@ services: - seafile-net seafile: - image: ${SEAFILE_IMAGE:-docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest} + image: ${SEAFILE_IMAGE:-seafileltd/seafile-pro-mc:12.0-latest} container_name: seafile # ports: # - "80:80" diff --git a/manual/setup/cluster_deploy_with_docker.md b/manual/setup/cluster_deploy_with_docker.md index c09f3924..bd0b1435 100644 --- a/manual/setup/cluster_deploy_with_docker.md +++ b/manual/setup/cluster_deploy_with_docker.md @@ -24,11 +24,8 @@ We assume you have already deployed memcache, MariaDB, ElasticSearch in separate 2. Pulling Seafile image - Log into Seafile's private repository and pull the Seafile image: - ```bash - docker login docker.seadrive.org - docker pull docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest + docker pull seafileltd/seafile-pro-mc:12.0-latest ``` When prompted, enter the username and password of the private repository. They are available on the download page in the [Customer Center](https://customer.seafile.com/downloads). diff --git a/manual/setup/cluster_deploy_with_k8s.md b/manual/setup/cluster_deploy_with_k8s.md index 0b49f23d..89805d0c 100644 --- a/manual/setup/cluster_deploy_with_k8s.md +++ b/manual/setup/cluster_deploy_with_k8s.md @@ -14,7 +14,7 @@ The two tools, **kubectl** and a **k8s control plane** tool (i.e., ***kubeadm*** If it is a multi-node deployment, k8s control plane needs to be installed on each node. After installation, you need to start the k8s control plane service on each node and refer to the k8s official manual for [creating a cluster](https://kubernetes.io/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/). Since this manual still uses the same image as docker deployment, we need to add the following repository to k8s: ```shell - kubectl create secret docker-registry regcred --docker-server=docker.seadrive.org/seafileltd --docker-username=seafile --docker-password=zjkmid6rQibdZ=uJMuWS + kubectl create secret docker-registry regcred --docker-server=seafileltd --docker-username=seafile --docker-password=zjkmid6rQibdZ=uJMuWS ``` ## YAML @@ -188,7 +188,7 @@ spec: - name: seafile # image: seafileltd/seafile-mc:9.0.10 # image: seafileltd/seafile-mc:11.0-latest - image: docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest + image: seafileltd/seafile-pro-mc:12.0-latest env: - name: DB_HOST value: "mariadb" diff --git a/manual/setup/seafile_docker_autostart.md b/manual/setup/seafile_docker_autostart.md index 82262718..d14aa918 100644 --- a/manual/setup/seafile_docker_autostart.md +++ b/manual/setup/seafile_docker_autostart.md @@ -64,7 +64,7 @@ elasticsearch: restart: unless-stopped seafile: - image: docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest + image: seafileltd/seafile-pro-mc:12.0-latest container_name: seafile restart: unless-stopped ``` diff --git a/manual/setup/setup_pro_by_docker.md b/manual/setup/setup_pro_by_docker.md index d5eb11c0..e5bf30b0 100644 --- a/manual/setup/setup_pro_by_docker.md +++ b/manual/setup/setup_pro_by_docker.md @@ -39,11 +39,8 @@ Use the [official installation guide for your OS to install Docker](https://docs ### Downloading the Seafile Image -Log into Seafile's private repository and pull the Seafile image: - ```bash -docker login docker.seadrive.org -docker pull docker.seadrive.org/seafileltd/seafile-pro-mc:12.0-latest +docker pull seafileltd/seafile-pro-mc:12.0-latest ``` When prompted, enter the username and password of the private repository. They are available on the download page in the [Customer Center](https://customer.seafile.com/downloads).