Merge branch '11.0.1'

2024-11-16 09:01:38 +00:00 · 2023-10-18 21:30:36 +02:00 · 2023-10-18 21:30:36 +02:00 · a21eae4941
parent b897bcff88 8aea3e37af
commit a21eae4941
6 changed files with 129 additions and 21 deletions
--- a/compose/docker-compose-dev.yml
+++ b/compose/docker-compose-dev.yml
@ -0,0 +1,79 @@
+version: '3.8'
+services:
+  seafile-server:
+    build: ../seafile-server/.
+    volumes:
+      - seafile-data:/shared
+    environment:
+      - DB_HOST=db
+      - DB_ROOT_PASSWD=db_dev
+      - TIME_ZONE=Europe/Berlin
+      - HTTPS=false
+      - SEAFILE_SERVER_HOSTNAME=localhost
+    depends_on:
+      - db
+      - memcached
+      - seafile-caddy
+    networks:
+      - seafile-net
+
+  seahub:
+    build: ../seahub/.
+    volumes:
+      - seafile-data:/shared
+      - seahub-avatars:/shared/seafile/seahub-data/avatars
+      - seahub-custom:/shared/seafile/seahub-data/custom
+    environment:
+      - SEAFILE_ADMIN_EMAIL=me@example.com
+      - SEAFILE_ADMIN_PASSWORD=asecret
+    depends_on:
+      - seafile-server
+      - seafile-caddy
+      - seahub-media
+    networks:
+      - seafile-net
+
+  seahub-media:
+    build: ../seahub-media/.
+    volumes:
+      - seahub-avatars:/usr/share/caddy/media/avatars
+      - seahub-custom:/usr/share/caddy/media/custom
+    depends_on:
+      - seafile-caddy
+    networks:
+      - seafile-net
+
+  db:
+    image: mariadb:10.11.5
+    environment:
+      - MYSQL_ROOT_PASSWORD=db_dev
+      - MYSQL_LOG_CONSOLE=true
+      - MARIADB_AUTO_UPGRADE=true
+    volumes:
+      - seafile-mariadb:/var/lib/mysql
+    networks:
+      - seafile-net
+
+  memcached:
+    image: memcached:1.6.22
+    entrypoint: memcached -m 1024
+    networks:
+      - seafile-net
+
+  seafile-caddy:
+    build: ../seafile-caddy/.
+    ports:
+      - "80:80"
+    networks:
+      - seafile-net
+      - default
+
+networks:
+  seafile-net:
+    internal: true
+
+volumes:
+  seafile-data:
+  seafile-mariadb:
+  seahub-avatars:
+  seahub-custom:
--- 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:10.0.1
+    image: ggogel/seafile-server:11.0.1
    volumes:
      - seafile-data:/shared 
    environment:
@ -18,7 +18,7 @@ services:
      endpoint_mode: dnsrr

  seahub:
-    image: ggogel/seahub:10.0.1
+    image: ggogel/seahub:11.0.1
    volumes:
      - seafile-data:/shared
      - seahub-avatars:/shared/seafile/seahub-data/avatars
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@ -1,7 +1,7 @@
 version: '3.8'
 services:
  seafile-server:
-    image: ggogel/seafile-server:10.0.1
+    image: ggogel/seafile-server:11.0.1
    volumes:
      - seafile-data:/shared 
    environment:
@ -18,7 +18,7 @@ services:
      - seafile-net

  seahub:
-    image: ggogel/seahub:10.0.1
+    image: ggogel/seahub:11.0.1
    volumes:
      - seafile-data:/shared
      - seahub-avatars:/shared/seafile/seahub-data/avatars
@ -34,7 +34,7 @@ services:
      - seafile-net
  
  seahub-media:
-    image: ggogel/seahub-media:10.0.1
+    image: ggogel/seahub-media:11.0.1
    volumes:
     - seahub-avatars:/usr/share/caddy/media/avatars
     - seahub-custom:/usr/share/caddy/media/custom
--- a/seafile-server/Dockerfile
+++ b/seafile-server/Dockerfile
@ -1,16 +1,34 @@
 FROM alpine:3.18.4 AS get

-RUN apk add --no-cache wget
+RUN apk add --no-cache wget sed

-ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.0.1
+ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=11.0.1

 RUN cd /tmp && \
    wget https://download.seadrive.org/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz && \
    tar -zxvf seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz && \
    rm -f seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz

+RUN sed -i '1d' /tmp/seafile-server-${SEAFILE_VERSION}/seahub/thirdpart/wsgidav/seafile_dav_provider.py
+
+FROM ubuntu:jammy AS pip
+
+RUN apt-get update && \
+DEBIAN_FRONTEND=noninteractive apt-get install -y \
+python3 \
+python3-pip \
+&& rm -rf /var/lib/apt/lists/*
+
+RUN pip3 install --target /pip-deps --timeout=3600 --no-cache-dir \
+sqlalchemy==2.0.*
+
+RUN find /pip-deps -name "__pycache__" -type d -exec rm -r {} + && \
+    rm -rf /pip-deps/pip /pip-deps/wheel /pip-deps/setuptools
+
 FROM ubuntu:jammy@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f

+ENV SEAFILE_VERSION=11.0.1
+
 RUN apt-get update && \
 DEBIAN_FRONTEND=noninteractive apt-get install -y \
 socat \
@ -27,16 +45,16 @@ python3-termcolor \
 python3-colorlog \
 python3-pymysql \
 python3-jinja2 \
-python3-sqlalchemy \
 python3-pycryptodome \
 python3-lxml \
+python3-ldap \
 && rm -rf /var/lib/apt/lists/*

 RUN cp -r  /usr/lib/python3/dist-packages/Cryptodome /usr/lib/python3/dist-packages/Crypto

-ENV SEAFILE_VERSION=10.0.1
-
+COPY --from=pip /pip-deps /usr/local/lib/python3.10/dist-packages
 COPY --from=get /tmp/seafile-server-${SEAFILE_VERSION} /opt/seafile/seafile-server-${SEAFILE_VERSION}
+
 COPY scripts /scripts
 RUN chmod u+x /scripts/*

@ -49,7 +67,7 @@ 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/notification-server.log &&\
 ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafile-monitor.log &&\
-echo "TLS_REQCERT     allow" >> /etc/ldap/ldap.conf
+mkdir -p /etc/ldap/ && echo "TLS_REQCERT     allow" >> /etc/ldap/ldap.conf

 EXPOSE 8001 8080 8082 8083

--- a/seahub-media/Dockerfile
+++ b/seahub-media/Dockerfile
@ -1,5 +1,5 @@
 FROM alpine:3.18.4 AS get
-ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.0.1
+ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=11.0.1

 RUN apk add --no-cache wget

--- a/seahub/Dockerfile
+++ b/seahub/Dockerfile
@ -1,5 +1,5 @@
 FROM alpine:3.18.4 AS get
-ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.0.1
+ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=11.0.1

 RUN apk add --no-cache wget

@ -25,12 +25,14 @@ openjpeg-dev \
 tiff-dev \
 tk-dev \
 tcl-dev \
-libmemcached-dev
+libmemcached-dev \
+openldap-dev \
+python3-dev

 RUN python3 -m pip install --upgrade pip &&\
-pip3 install --timeout=3600 \
+pip3 install --target /pip-deps --timeout=3600 --no-cache-dir  \
 future==0.18.* \
-pillow==9.3.* \
+pillow==10.0.* \
 captcha==0.4 \
 pyjwt==2.6.* \
 mysqlclient==2.1.* \
@ -38,7 +40,12 @@ django==3.2.* \
 django-pylibmc \
 django-simple-captcha==0.5.* \
 pycryptodome==3.18.* \
-&& rm -r /root/.cache/pip
+djangosaml2==1.5.* \
+python-ldap==3.4.* \
+sqlalchemy==2.0.*
+
+RUN find /pip-deps -name "__pycache__" -type d -exec rm -r {} + && \
+    rm -rf /pip-deps/pip /pip-deps/wheel /pip-deps/setuptools

 FROM python:3.10.13-alpine3.18

@ -55,22 +62,25 @@ tk \
 mariadb-dev \
 libmemcached \
 netcat-openbsd \
-gcompat
+gcompat \
+openldap

+COPY --from=pip /pip-deps /usr/local/lib/python3.10/site-packages
 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
 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/lib/python3/site-packages
-COPY --from=pip /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
-COPY scripts /scripts
+COPY --from=get /tmp/seafile-server*/pro/python/seafevents /opt/seafile/seafile-server-latest/pro/python/seafevents

+COPY scripts /scripts
 RUN chmod u+x /scripts/*
+
 RUN mkdir -p /opt/seafile/logs &&\
 touch /opt/seafile/logs/seahub.log &&\
 mkdir -p /opt/seafile/pids

-ENV PYTHONPATH=/usr/local/lib/python3.10/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 PYTHONPATH=/usr/local/lib/python3.10/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:/opt/seafile/seafile-server-latest/pro/python
 ENV CCNET_CONF_DIR=/opt/seafile/conf/ccnet
 ENV SEAFILE_CONF_DIR=/opt/seafile/seafile-data
 ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf
@ -80,6 +90,7 @@ ENV SEAHUB_LOG_DIR=/opt/seafile/logs
 ENV SEAFILE_ADMIN_EMAIL=me@example.com
 ENV SEAFILE_ADMIN_PASSWORD=asecret
 ENV PYTHON=python3
+ENV SEAHUB_DIR=/opt/seafile/seafile-server-latest/seahub

 EXPOSE 8000