From 8ef719e64b7df85cf2d94341633ee20e46f205c4 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 17:10:33 +0300 Subject: [PATCH 01/10] bump seafile version to 9.0.0 --- compose/docker-compose-swarm.yml | 4 ++-- compose/docker-compose.yml | 6 +++--- seafile-server/Dockerfile | 4 ++-- seahub-media/Dockerfile | 2 +- seahub/Dockerfile | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compose/docker-compose-swarm.yml b/compose/docker-compose-swarm.yml index dae843e..12ece65 100644 --- a/compose/docker-compose-swarm.yml +++ b/compose/docker-compose-swarm.yml @@ -1,7 +1,7 @@ version: '3.8' services: seafile-server: - image: ggogel/seafile-server:8.0.7 + image: ggogel/seafile-server:9.0.0 volumes: - seafile-data:/shared environment: @@ -18,7 +18,7 @@ services: endpoint_mode: dnsrr seahub: - image: ggogel/seahub:8.0.7 + image: ggogel/seahub:9.0.0 volumes: - seafile-data:/shared - seahub-avatars:/shared/seafile/seahub-data/avatars diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 3871f02..86e2c79 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: seafile-server: - image: ggogel/seafile-server:8.0.7 + image: ggogel/seafile-server:9.0.0 volumes: - seafile-data:/shared environment: @@ -19,7 +19,7 @@ services: - seafile-net seahub: - image: ggogel/seahub:8.0.7 + image: ggogel/seahub:9.0.0 volumes: - seafile-data:/shared - seahub-avatars:/shared/seafile/seahub-data/avatars @@ -35,7 +35,7 @@ services: - seafile-net seahub-media: - image: ggogel/seahub-media:8.0.7 + image: ggogel/seahub-media:9.0.0 volumes: - seahub-avatars:/usr/share/caddy/media/avatars - seahub-custom:/usr/share/caddy/media/custom diff --git a/seafile-server/Dockerfile b/seafile-server/Dockerfile index 7c2e9dd..817beed 100644 --- a/seafile-server/Dockerfile +++ b/seafile-server/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.13.5 AS get RUN apk add --no-cache wget -ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=8.0.7 +ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0 RUN cd /tmp && \ wget https://download.seadrive.org/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz && \ @@ -28,7 +28,7 @@ python3-jinja2 \ python3-sqlalchemy \ && rm -rf /var/lib/apt/lists/* -ENV SEAFILE_VERSION=8.0.7 +ENV SEAFILE_VERSION=9.0.0 COPY --from=get /tmp/seafile-server-${SEAFILE_VERSION} /opt/seafile/seafile-server-${SEAFILE_VERSION} COPY scripts /scripts diff --git a/seahub-media/Dockerfile b/seahub-media/Dockerfile index e889e06..6fdcac8 100644 --- a/seahub-media/Dockerfile +++ b/seahub-media/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.13.5 AS get -ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=8.0.7 +ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0 RUN apk add --no-cache wget diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 134cbe1..5f4375b 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.13.5 AS get -ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=8.0.7 +ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0 RUN apk add --no-cache wget From ab15add43a22b0dada72df58546586611ba3376e Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 17:16:57 +0300 Subject: [PATCH 02/10] bump seafile-server base image to ubuntu:focal-20211006 --- seafile-server/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seafile-server/Dockerfile b/seafile-server/Dockerfile index 817beed..30974f3 100644 --- a/seafile-server/Dockerfile +++ b/seafile-server/Dockerfile @@ -9,7 +9,7 @@ RUN cd /tmp && \ tar -zxvf seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz && \ rm -f seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz -FROM ubuntu:bionic-20210723 +FROM ubuntu:focal-20211006 RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y \ From 4ff9cbe5efa3930ac1034764357fc2f6486fdf3f Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 17:19:17 +0300 Subject: [PATCH 03/10] bump django version to 3.2.9 --- seahub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 5f4375b..4388bbd 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -37,7 +37,7 @@ pillow \ captcha \ pyjwt \ mysqlclient \ -django==2.2.* \ +django==3.2.9 \ django-pylibmc \ django-simple-captcha \ && rm -r /root/.cache/pip From 85ee48f98f412cf0e46a12c66c3bd7fb18be84a4 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 17:35:37 +0300 Subject: [PATCH 04/10] bump alpine linux to 3.13.6 for all images --- seafile-server/Dockerfile | 2 +- seahub-media/Dockerfile | 2 +- seahub/Dockerfile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/seafile-server/Dockerfile b/seafile-server/Dockerfile index 30974f3..20bbbef 100644 --- a/seafile-server/Dockerfile +++ b/seafile-server/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13.5 AS get +FROM alpine:3.13.6 AS get RUN apk add --no-cache wget diff --git a/seahub-media/Dockerfile b/seahub-media/Dockerfile index 6fdcac8..92e4f20 100644 --- a/seahub-media/Dockerfile +++ b/seahub-media/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13.5 AS get +FROM alpine:3.13.6 AS get ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0 RUN apk add --no-cache wget diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 4388bbd..702c51f 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13.5 AS get +FROM alpine:3.13.6 AS get ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0 RUN apk add --no-cache wget @@ -12,7 +12,7 @@ RUN sed -i "s@.*INNER_FILE_SERVER_ROOT.*@INNER_FILE_SERVER_ROOT = os.environ.get RUN sed -i '/warning_if_seafile_not_running;/d' /tmp/seafile-server-${SEAFILE_VERSION}/seahub.sh -FROM alpine:3.13.5 AS pip +FROM alpine:3.13.6 AS pip RUN apk add --no-cache \ python3-dev \ @@ -42,7 +42,7 @@ django-pylibmc \ django-simple-captcha \ && rm -r /root/.cache/pip -FROM alpine:3.13.5 +FROM alpine:3.13.6 RUN apk add --no-cache \ bash \ From 7cff82ecc159d004162318164c734c8f98a961d0 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 19:54:30 +0300 Subject: [PATCH 05/10] adapt to seafile 9.0.0 python lib path --- seahub/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 702c51f..c40b721 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -63,7 +63,7 @@ COPY --from=get /tmp/seafile-server*/seahub /opt/seafile/seafile-server-latest/s COPY --from=get /tmp/seafile-server*/runtime /opt/seafile/seafile-server-latest/runtime COPY --from=get /tmp/seafile-server*/seahub.sh /opt/seafile/seafile-server-latest/seahub.sh COPY --from=get /tmp/seafile-server*/check_init_admin.py /opt/seafile/seafile-server-latest/check_init_admin.py -COPY --from=get /tmp/seafile-server*/seafile/lib64/python3.6/site-packages /opt/seafile/seafile-server-latest/seafile/lib64/python3.6/site-packages +COPY --from=get /tmp/seafile-server*/seafile/lib/python3/site-packages /opt/seafile/seafile-server-latest/seafile/lib64/python3/site-packages COPY --from=pip /usr/lib/python3.8/site-packages /usr/lib/python3.8/site-packages COPY scripts /scripts @@ -72,7 +72,7 @@ RUN mkdir -p /opt/seafile/logs &&\ touch /opt/seafile/logs/seahub.log &&\ mkdir -p /opt/seafile/pids -ENV PYTHONPATH=/usr/lib/python3.8/site-packages:/opt/seafile/seafile-server-latest/seahub/thirdpart:/opt/seafile/seafile-server-latest/seafile/lib64/python3.6/site-packages:/opt/seafile/seafile-server-latest/seahub +ENV PYTHONPATH=/usr/lib/python3.8/site-packages:/opt/seafile/seafile-server-latest/seahub/thirdpart:/opt/seafile/seafile-server-latest/seafile/lib/python3/site-packages:/opt/seafile/seafile-server-latest/seahub ENV CCNET_CONF_DIR=/opt/seafile/conf/ccnet ENV SEAFILE_CONF_DIR=/opt/seafile/seafile-data ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf From 541acbdd098a3a271235d2a6461a25b1fd1d8d52 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 19:55:19 +0300 Subject: [PATCH 06/10] fix shared folders linking --- seafile-server/scripts/create_data_links.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seafile-server/scripts/create_data_links.sh b/seafile-server/scripts/create_data_links.sh index 1346dd3..cf8a6a0 100644 --- a/seafile-server/scripts/create_data_links.sh +++ b/seafile-server/scripts/create_data_links.sh @@ -30,7 +30,8 @@ dirs=( for d in ${dirs[*]}; do src=/shared/seafile/$d if [[ -e $src ]]; then - rm -rf /opt/seafile/$d && ln -sf $src /opt/seafile + rm -rf /opt/seafile/$d + ln -sf $src /opt/seafile fi done From 14c94084a9da1dcdc6a770e002407a29ef44c60b Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 23:44:31 +0300 Subject: [PATCH 07/10] fix seafile 9.0.0 python lib path --- seahub/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seahub/Dockerfile b/seahub/Dockerfile index c40b721..26c32f3 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -63,7 +63,7 @@ COPY --from=get /tmp/seafile-server*/seahub /opt/seafile/seafile-server-latest/s COPY --from=get /tmp/seafile-server*/runtime /opt/seafile/seafile-server-latest/runtime COPY --from=get /tmp/seafile-server*/seahub.sh /opt/seafile/seafile-server-latest/seahub.sh COPY --from=get /tmp/seafile-server*/check_init_admin.py /opt/seafile/seafile-server-latest/check_init_admin.py -COPY --from=get /tmp/seafile-server*/seafile/lib/python3/site-packages /opt/seafile/seafile-server-latest/seafile/lib64/python3/site-packages +COPY --from=get /tmp/seafile-server*/seafile/lib/python3/site-packages /opt/seafile/seafile-server-latest/seafile/lib/python3/site-packages COPY --from=pip /usr/lib/python3.8/site-packages /usr/lib/python3.8/site-packages COPY scripts /scripts From 58d28a23f993d2414c762ea2435b5d0f66684288 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 23:44:52 +0300 Subject: [PATCH 08/10] add gcompat package --- seahub/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 26c32f3..96341be 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -57,7 +57,8 @@ tiff \ tk \ mariadb-dev \ libmemcached \ -netcat-openbsd +netcat-openbsd \ +gcompat COPY --from=get /tmp/seafile-server*/seahub /opt/seafile/seafile-server-latest/seahub COPY --from=get /tmp/seafile-server*/runtime /opt/seafile/seafile-server-latest/runtime From 0ccaad60a438f004e4579bc630fd27a22a1f84fc Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Thu, 11 Nov 2021 23:46:35 +0300 Subject: [PATCH 09/10] add ldap & ca-certificates packages and config --- seafile-server/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/seafile-server/Dockerfile b/seafile-server/Dockerfile index 20bbbef..6c1b9d7 100644 --- a/seafile-server/Dockerfile +++ b/seafile-server/Dockerfile @@ -19,6 +19,8 @@ tzdata \ psmisc \ net-tools \ libmariadb-dev \ +ldap-utils \ +ca-certificates \ python3 \ python3-click \ python3-termcolor \ @@ -40,7 +42,8 @@ ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafile.log &&\ ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/controller.log &&\ ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/ccnet.log &&\ ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/gc.log &&\ -ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafdav.log +ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafdav.log &&\ +echo "TLS_REQCERT allow" >> /etc/ldap/ldap.conf EXPOSE 8080 8082 8001 From 3410ef19f722601056d1b42655c3801d3c94b376 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Tue, 16 Nov 2021 17:00:21 +0300 Subject: [PATCH 10/10] add missing import for onlyoffice views --- seahub/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 96341be..7d44e4d 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -12,6 +12,8 @@ RUN sed -i "s@.*INNER_FILE_SERVER_ROOT.*@INNER_FILE_SERVER_ROOT = os.environ.get RUN sed -i '/warning_if_seafile_not_running;/d' /tmp/seafile-server-${SEAFILE_VERSION}/seahub.sh +RUN sed -i '1s;^;from django.core.cache import cache\n;' /tmp/seafile-server-${SEAFILE_VERSION}/seahub/seahub/onlyoffice/views.py + FROM alpine:3.13.6 AS pip RUN apk add --no-cache \