vikarti.anatra/seafile-containerized
1
0
Fork 0
mirror of https://github.com/ggogel/seafile-containerized.git synced 2024-11-16 17:05:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #58 from haiwen/update-image-name

Browse source 
pro-seafile -> seafile-pro
This commit is contained in:
Daniel Pan 2018-05-10 11:53:18 +08:00 committed by GitHub
parent e84a07d51a f3ebdbcb7d
commit 1e2ab49cc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MAINT.md
View file

@ -35,7 +35,7 @@ git push origin master
git push origin seafile-pro-base git push origin seafile-pro-base
``` ```
* Create a tag "v6.0.7-pro" and push it to github. Wait for travis ci to finish: this time it would push the image ${registry}/seafileltd/pro-seafile:6.0.7 to docker Registry since it's triggered by a tag. * Create a tag "v6.0.7-pro" and push it to github. Wait for travis ci to finish: this time it would push the image ${registry}/seafileltd/seafile-pro:6.0.7 to docker Registry since it's triggered by a tag.
```sh ```sh
git tag v6.0.7-pro git tag v6.0.7-pro
git push origin v6.0.7 git push origin v6.0.7

10
README.pro.md
View file

@ -27,7 +27,7 @@ docker run -d --name seafile \
-e SEAFILE_SERVER_HOSTNAME=seafile.example.com \ -e SEAFILE_SERVER_HOSTNAME=seafile.example.com \
-v /opt/seafile-data:/shared \ -v /opt/seafile-data:/shared \
-p 80:80 \ -p 80:80 \
{pro-host}/seafileltd/pro-seafile:latest {pro-host}/seafileltd/seafile-pro:latest
``` ```
Wait for a few minutes for the first time initialization, then visit `http://seafile.example.com` to open Seafile Web UI. Wait for a few minutes for the first time initialization, then visit `http://seafile.example.com` to open Seafile Web UI.
@ -48,7 +48,7 @@ docker run -d --name seafile \
-e SEAFILE_ADMIN_PASSWORD=a_very_secret_password \ -e SEAFILE_ADMIN_PASSWORD=a_very_secret_password \
-v /opt/seafile-data:/shared \ -v /opt/seafile-data:/shared \
-p 80:80 \ -p 80:80 \
{pro-host}/seafileltd/pro-seafile:latest {pro-host}/seafileltd/seafile-pro:latest
``` ```
If you forget the admin password, you can add a new admin account and then go to the sysadmin panel to reset user password. If you forget the admin password, you can add a new admin account and then go to the sysadmin panel to reset user password.
@ -68,7 +68,7 @@ docker run -d --name seafile \
-v /opt/seafile-data:/shared \ -v /opt/seafile-data:/shared \
-p 80:80 \ -p 80:80 \
-p 443:443 \ -p 443:443 \
{pro-host}/seafileltd/pro-seafile:latest {pro-host}/seafileltd/seafile-pro:latest
``` ```
If you want to use your own SSL certificate: If you want to use your own SSL certificate:
@ -119,7 +119,7 @@ Placeholder spot for shared volumes. You may elect to store certain persistent i
TO upgrade to latest version of seafile server: TO upgrade to latest version of seafile server:
```sh ```sh
docker pull {pro-host}/seafileltd/pro-seafile:latest docker pull {pro-host}/seafileltd/seafile-pro:latest
docker rm -f seafile docker rm -f seafile
docker run -d --name seafile \ docker run -d --name seafile \
-e SEAFILE_SERVER_LETSENCRYPT=true \ -e SEAFILE_SERVER_LETSENCRYPT=true \
@ -129,7 +129,7 @@ docker run -d --name seafile \
-v /opt/seafile-data:/shared \ -v /opt/seafile-data:/shared \
-p 80:80 \ -p 80:80 \
-p 443:443 \ -p 443:443 \
{pro-host}/seafileltd/pro-seafile:latest {pro-host}/seafileltd/seafile-pro:latest
``` ```
If you are one of the early users who use the `launcher` script, you should refer to [upgrade from old format](https://github.com/haiwen/seafile-docker/blob/master/upgrade_from_old_format.md) document. If you are one of the early users who use the `launcher` script, you should refer to [upgrade from old format](https://github.com/haiwen/seafile-docker/blob/master/upgrade_from_old_format.md) document.

4
ci/ci.sh
View file

@ -14,7 +14,7 @@ set -e -x
) )
mkdir -p /opt/seafile-data mkdir -p /opt/seafile-data
docker run -d --name seafile -e SEAFILE_SERVER_HOSTNAME=127.0.0.1 -v /opt/seafile-data:/shared -p 80:80 -p 443:443 seafileltd/pro-seafile:$version docker run -d --name seafile -e SEAFILE_SERVER_HOSTNAME=127.0.0.1 -v /opt/seafile-data:/shared -p 80:80 -p 443:443 seafileltd/seafile-pro:$version
cat > doc.md <<EOF cat > doc.md <<EOF
@ -30,7 +30,7 @@ docker restart seafile
sleep 30 sleep 30
python ci/validate_file.py doc.md python ci/validate_file.py doc.md
docker rm -f seafile docker rm -f seafile
docker run -d --name seafile -e SEAFILE_SERVER_HOSTNAME=127.0.0.1 -v /opt/seafile-data:/shared -p 80:80 -p 443:443 seafileltd/pro-seafile:$version docker run -d --name seafile -e SEAFILE_SERVER_HOSTNAME=127.0.0.1 -v /opt/seafile-data:/shared -p 80:80 -p 443:443 seafileltd/seafile-pro:$version
sleep 30 sleep 30
python ci/validate_file.py doc.md python ci/validate_file.py doc.md

3
ci/publish-image.sh
View file

@ -12,7 +12,8 @@ set -o pipefail
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
## Always use the base image we build manually to reduce the download size of the end user. ## Always use the base image we build manually to reduce the download size of the end user.
docker rmi -f $(docker images | awk {'print $3'}) docker rm -f $(docker ps -a -q)
docker rmi -f $(docker images -a -q)
docker pull seafileltd/base:16.04 docker pull seafileltd/base:16.04
( (

5
ci/publish-pro-image.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
###################################### ######################################
# Publish the seafile pro-server image (e.g. seafileltd/pro-seafile:6.2.3) to docker # Publish the seafile pro-server image (e.g. seafileltd/seafile-pro:6.2.3) to docker
# registry. This script should only be called during a travis build trigger by a tag. # registry. This script should only be called during a travis build trigger by a tag.
###################################### ######################################
@ -12,7 +12,8 @@ set -o pipefail
docker login -u="$DOCKER_PRO_REGISTRY_USER" -p="$DOCKER_PRO_REGISTRY_PASSWORD" docker-internal.seadrive.org docker login -u="$DOCKER_PRO_REGISTRY_USER" -p="$DOCKER_PRO_REGISTRY_PASSWORD" docker-internal.seadrive.org
## Always use the base image we build manually to reduce the download size of the end user. ## Always use the base image we build manually to reduce the download size of the end user.
docker rmi -f $(docker images | awk {'print $3'}) docker rm -f $(docker ps -a -q)
docker rmi -f $(docker images -a -q)
docker pull docker-internal.seadrive.org/seafileltd/pro-base:16.04 docker pull docker-internal.seadrive.org/seafileltd/pro-base:16.04
docker tag docker-internal.seadrive.org/seafileltd/pro-base:16.04 seafileltd/pro-base:16.04 docker tag docker-internal.seadrive.org/seafileltd/pro-base:16.04 seafileltd/pro-base:16.04

6
image/Makefile
View file

@ -6,9 +6,9 @@ pro_base_image=seafileltd/pro-base:16.04
pro_base_image_squashed=seafileltd/pro-base:16.04-squashed pro_base_image_squashed=seafileltd/pro-base:16.04-squashed
server_image=seafileltd/seafile:$(server_version) server_image=seafileltd/seafile:$(server_version)
server_image_squashed=seafileltd/seafile:$(server_version)-squashed server_image_squashed=seafileltd/seafile:$(server_version)-squashed
pro_server_image=seafileltd/pro-seafile:$(server_version) pro_server_image=seafileltd/seafile-pro:$(server_version)
pro_server_image_squashed=seafileltd/pro-seafile:$(server_version)-squashed pro_server_image_squashed=seafileltd/seafile-pro:$(server_version)-squashed
latest_pro_server_image=seafileltd/pro-seafile:latest latest_pro_server_image=seafileltd/seafile-pro:latest
latest_server_image=seafileltd/seafile:latest latest_server_image=seafileltd/seafile:latest
all: all: