Skip to content

Commit

Permalink
Update to 6.2.5 and also publish the "latest" tag
Browse files Browse the repository at this point in the history
  • Loading branch information
lins05 committed Apr 12, 2018
1 parent 0768ace commit d1366fa
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 22 deletions.
12 changes: 6 additions & 6 deletions ci/ci.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

version=6.2.3
version=6.2.5
set -e -x


Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/publish-image.sh
Original file line number Diff line number Diff line change
@@ -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.
######################################

Expand Down
5 changes: 4 additions & 1 deletion image/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion image/seafile/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
16 changes: 5 additions & 11 deletions upgrade_from_old_format.md
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit d1366fa

Please sign in to comment.