diff --git a/ci/ci.sh b/ci/ci.sh index c384579..df3bd0e 100755 --- a/ci/ci.sh +++ b/ci/ci.sh @@ -1,6 +1,6 @@ #!/bin/bash -version=6.2.3 +version=6.2.5 set -e -x @@ -12,11 +12,11 @@ set -e -x make server ) -mkdir -p /opt/seafile-docker-data -docker run -d --name seafile-server -v /opt/seafile-docker-data:/shared -p 80:80 -p 443:443 seafileltd/seafile:$version -docker stop seafile-server -docker start seafile-server -docker restart seafile-server +mkdir -p /opt/seafile-data +docker run -d --name seafile -v /opt/seafile-data:/shared -p 80:80 -p 443:443 seafileltd/seafile:$version +docker stop seafile +docker start seafile +docker restart seafile if [[ $TRAVIS_TAG != "" ]]; then ci/publish-image.sh diff --git a/ci/publish-image.sh b/ci/publish-image.sh index 4030b2d..183fb86 100755 --- a/ci/publish-image.sh +++ b/ci/publish-image.sh @@ -1,7 +1,7 @@ #!/bin/bash ###################################### -# Publish the seafile server image (e.g. seafileltd/seafile:6.2.3) to docker +# Publish the seafile server image (e.g. seafileltd/seafile:6.2.5) to docker # registry. This script should only be called during a travis build trigger by a tag. ###################################### diff --git a/image/Makefile b/image/Makefile index f2c15b5..718af8e 100644 --- a/image/Makefile +++ b/image/Makefile @@ -1,8 +1,9 @@ -server_version=6.2.3 +server_version=6.2.5 base_image=seafileltd/base:16.04 base_image_squashed=seafileltd/base:16.04-squashed server_image=seafileltd/seafile:$(server_version) +latest_server_image=seafileltd/seafile:latest all: @echo @@ -18,12 +19,14 @@ squash-base: server: cd seafile && docker build -t $(server_image) . + docker tag $(server_image) $(latest_server_image) push-base: docker push $(base_image) push-server: docker push $(server_image) + docker push $(latest_server_image) push: push-base push-server diff --git a/image/seafile/Dockerfile b/image/seafile/Dockerfile index 78b2b3f..2188de8 100644 --- a/image/seafile/Dockerfile +++ b/image/seafile/Dockerfile @@ -8,7 +8,7 @@ RUN sed -i -e 's|\(^exec syslog-ng.*$\)|\1 >>/var/log/syslog-ng.log 2>\&1|g' /et RUN mkdir -p /etc/my_init.d -ENV SEAFILE_VERSION=6.2.3 +ENV SEAFILE_VERSION=6.2.5 RUN mkdir -p /opt/seafile/ && \ curl -sSL -o - https://download.seadrive.org/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz \ diff --git a/tests/Dockerfile b/tests/Dockerfile index 1b9b9a8..f264004 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -1,7 +1,7 @@ -FROM seafileltd/seafile:6.2.3 +FROM seafileltd/seafile:6.2.5 ENV SEAFILE_VERSION=6.1.0 -RUN mv /opt/seafile/seafile-server-6.2.3 /opt/seafile/seafile-server-${SEAFILE_VERSION} +RUN mv /opt/seafile/seafile-server-6.2.5 /opt/seafile/seafile-server-${SEAFILE_VERSION} ADD upgrade_6.0_6.1.sh /opt/seafile/seafile-server-${SEAFILE_VERSION}/upgrade/upgrade_6.0_6.1.sh diff --git a/upgrade_from_old_format.md b/upgrade_from_old_format.md index fcbddfa..4610c0e 100644 --- a/upgrade_from_old_format.md +++ b/upgrade_from_old_format.md @@ -1,21 +1,15 @@ Follow these steps: -1. Stop the old container. -2. Delete the old container. -3. Delete the old images. -4. Clone the latest docker project. -5. Build the new images. +1. Stop & Delete the old container. +5. Pull the new images. 6. Run the new container. e.g. Assume your old project path is /opt/seafile-docker, so your data path is /opt/seafile-docker/shared. - docker stop seafile - docker rm seafile - docker rmi $(image id) - git cloen https://github.com/haiwen/seafile-docker.git - cd images && make base && make server - docker run -it --name seafile -v /opt/seafile-docker/shared:/shared -p 80:80 -p 443:443 seafileltd/seafile:6.2.3 + docker rm -f seafile + docker pull seafileltd/seafile:latest + docker run -it --name seafile -v /opt/seafile-docker/shared:/shared -p 80:80 -p 443:443 seafileltd/seafile:latest Congratulations, you've upgraded to a new version.