Merge pull request #349 from ggogel/renovate/python-3.10.x

Update python Docker tag to v3.10.16
Merge pull request #348 from ggogel/renovate/memcached-1.6.x
2025-04-25 02:59:11 +00:00 · 2025-01-04 12:52:04 +03:00 · 2025-01-04 12:51:47 +03:00 · 2025-01-04 12:51:31 +03:00 · 2025-01-04 12:51:20 +03:00 · 2025-01-04 12:49:31 +03:00
14 changed files with 64 additions and 39 deletions
--- a/.github/workflows/auto_release.yml
+++ b/.github/workflows/auto_release.yml
@ -15,7 +15,7 @@ jobs:

    steps:
    - name: Check out code
-      uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
      with:
        fetch-depth: 0

--- a/compose/docker-compose-dev.yml
+++ b/compose/docker-compose-dev.yml
@ -50,7 +50,7 @@ services:
    restart: unless-stopped

  db:
-    image: mariadb:10.11.9
+    image: mariadb:10.11.10
    environment:
      - MYSQL_ROOT_PASSWORD=db_dev
      - MYSQL_LOG_CONSOLE=true
@ -67,7 +67,7 @@ services:
    restart: unless-stopped

  memcached:
-    image: memcached:1.6.31
+    image: memcached:1.6.34
    entrypoint: memcached -m 1024
    networks:
      - seafile-net
--- a/compose/docker-compose-kompose.yml
+++ b/compose/docker-compose-kompose.yml
@ -4,7 +4,7 @@
 version: '3.8'
 services:
  seafile-server:
-    image: ggogel/seafile-server:11.0.12
+    image: ggogel/seafile-server:11.0.13
    volumes:
      - seafile-data:/shared 
    environment:
@ -29,7 +29,7 @@ services:
    restart: always

  seahub:
-    image: ggogel/seahub:11.0.12
+    image: ggogel/seahub:11.0.13
    volumes:
      - seafile-data:/shared
      - seahub-avatars:/shared/seafile/seahub-data/avatars
@ -44,7 +44,7 @@ services:
    restart: always
  
  seahub-media:
-    image: ggogel/seahub-media:11.0.12
+    image: ggogel/seahub-media:11.0.13
    volumes:
     - seahub-avatars:/usr/share/caddy/media/avatars
     - seahub-custom:/usr/share/caddy/media/custom
@ -58,7 +58,7 @@ services:
    restart: always

  db:
-    image: mariadb:10.11.9
+    image: mariadb:10.11.10
    environment:
      - MYSQL_ROOT_PASSWORD=db_dev
      - MYSQL_LOG_CONSOLE=true
@ -79,7 +79,7 @@ services:
    restart: always

  memcached:
-    image: memcached:1.6.31
+    image: memcached:1.6.34
    entrypoint: memcached -m 1024
    networks:
      - seafile-net
--- 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:11.0.12
+    image: ggogel/seafile-server:11.0.13
    volumes:
      - seafile-data:/shared 
    environment:
@ -18,7 +18,7 @@ services:
      endpoint_mode: dnsrr

  seahub:
-    image: ggogel/seahub:11.0.12
+    image: ggogel/seahub:11.0.13
    volumes:
      - seafile-data:/shared
      - seahub-avatars:/shared/seafile/seahub-data/avatars
@ -46,7 +46,7 @@ services:
      endpoint_mode: dnsrr

  db:
-    image: mariadb:10.11.9
+    image: mariadb:10.11.10
    environment:
      - MYSQL_ROOT_PASSWORD=db_dev
      - MYSQL_LOG_CONSOLE=true
@ -57,7 +57,7 @@ services:
      - seafile-net

  memcached:
-    image: memcached:1.6.31
+    image: memcached:1.6.34
    entrypoint: memcached -m 1024
    networks:
      - seafile-net
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@ -1,7 +1,7 @@
 version: '3.8'
 services:
  seafile-server:
-    image: ggogel/seafile-server:11.0.12
+    image: ggogel/seafile-server:11.0.13
    volumes:
      - seafile-data:/shared
    environment:
@ -23,7 +23,7 @@ services:
    restart: unless-stopped

  seahub:
-    image: ggogel/seahub:11.0.12
+    image: ggogel/seahub:11.0.13
    volumes:
      - seafile-data:/shared
      - seahub-avatars:/shared/seafile/seahub-data/avatars
@ -41,7 +41,7 @@ services:
    restart: unless-stopped

  seahub-media:
-    image: ggogel/seahub-media:11.0.12
+    image: ggogel/seahub-media:11.0.13
    volumes:
      - seahub-avatars:/usr/share/caddy/media/avatars
      - seahub-custom:/usr/share/caddy/media/custom
@ -50,7 +50,7 @@ services:
    restart: unless-stopped

  db:
-    image: mariadb:10.11.9
+    image: mariadb:10.11.10
    environment:
      - MYSQL_ROOT_PASSWORD=db_dev
      - MYSQL_LOG_CONSOLE=true
@ -67,7 +67,7 @@ services:
    restart: unless-stopped

  memcached:
-    image: memcached:1.6.31
+    image: memcached:1.6.34
    entrypoint: memcached -m 1024
    networks:
      - seafile-net
--- a/k8s/db-deployment.yaml
+++ b/k8s/db-deployment.yaml
@ -41,7 +41,7 @@ spec:
              value: "true"
            - name: MYSQL_ROOT_PASSWORD
              value: db_dev
-          image: mariadb:10.11.9
+          image: mariadb:10.11.10
          name: db
          ports:
            - containerPort: 3306
--- a/k8s/memcached-deployment.yaml
+++ b/k8s/memcached-deployment.yaml
@ -23,7 +23,7 @@ spec:
            - memcached
            - -m
            - "1024"
-          image: memcached:1.6.31
+          image: memcached:1.6.34
          name: memcached
          ports:
            - containerPort: 11211
--- a/k8s/seafile-server-deployment.yaml
+++ b/k8s/seafile-server-deployment.yaml
@ -43,7 +43,7 @@ spec:
              value: seafile.mydomain.com
            - name: TIME_ZONE
              value: Europe/Berlin
-          image: ggogel/seafile-server:11.0.12
+          image: ggogel/seafile-server:11.0.13
          name: seafile-server
          ports:
            - containerPort: 8001
--- a/k8s/seahub-deployment.yaml
+++ b/k8s/seahub-deployment.yaml
@ -25,7 +25,7 @@ spec:
              value: me@example.com
            - name: SEAFILE_ADMIN_PASSWORD
              value: asecret
-          image: ggogel/seahub:11.0.12
+          image: ggogel/seahub:11.0.13
          name: seahub
          ports:
            - containerPort: 8000
--- a/k8s/seahub-media-deployment.yaml
+++ b/k8s/seahub-media-deployment.yaml
@ -26,7 +26,7 @@ spec:
        io.kompose.service: seahub-media
    spec:
      containers:
-        - image: ggogel/seahub-media:11.0.12
+        - image: ggogel/seahub-media:11.0.13
          name: seahub-media
          ports:
            - containerPort: 80
--- a/seafile-server/Dockerfile
+++ b/seafile-server/Dockerfile
@ -4,7 +4,7 @@ RUN apt-get update && \
    apt-get install -y software-properties-common wget && \
    add-apt-repository ppa:longsleep/golang-backports

-ENV SEAFILE_VERSION=11.0.12
+ENV SEAFILE_VERSION=11.0.13

 WORKDIR /tmp
 RUN wget https://raw.githubusercontent.com/haiwen/seafile-docker/master/build/seafile-build.sh
@ -14,7 +14,7 @@ RUN ./seafile-build.sh ${SEAFILE_VERSION}

 FROM alpine:3.20.3 AS clean

-ENV SEAFILE_VERSION=11.0.12
+ENV SEAFILE_VERSION=11.0.13

 COPY --from=build /tmp/seafile-server-${SEAFILE_VERSION} /tmp/seafile-server-${SEAFILE_VERSION}

@ -32,27 +32,27 @@ libsasl2-dev \

 RUN pip3 install --target /pip-deps --timeout=3600 --no-cache-dir \
 sqlalchemy==2.0.36 \
-click==8.1.7 \
+click==8.1.8 \
 termcolor==2.5.0 \
-colorlog==6.8.2 \
+colorlog==6.9.0 \
 pymysql==1.1.1 \
-jinja2==3.1.4 \
+jinja2==3.1.5 \
 pycryptodome==3.21.0 \
 lxml==5.3.0 \
 python-ldap==3.4.4 \
 pytz==2024.2 \
-django==4.2.16 \
+django==4.2.17 \
 requests==2.32.3 \
 PyYAML==6.0.2 \
 defusedxml==0.7.1 \
-json5==0.9.25
+json5==0.9.28

 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:0e5e4a57c2499249aafc3b40fcd541e9a456aab7296681a3994d631587203f97

-ENV SEAFILE_VERSION=11.0.12
+ENV SEAFILE_VERSION=11.0.13

 RUN apt-get update && \
 DEBIAN_FRONTEND=noninteractive apt-get install -y \
--- a/seahub-media/Dockerfile
+++ b/seahub-media/Dockerfile
@ -4,7 +4,7 @@ RUN apt-get update && \
    apt-get install -y software-properties-common wget && \
    add-apt-repository ppa:longsleep/golang-backports

-ENV SEAFILE_VERSION=11.0.12
+ENV SEAFILE_VERSION=11.0.13

 WORKDIR /tmp
 RUN wget https://raw.githubusercontent.com/haiwen/seafile-docker/master/build/seafile-build.sh
--- a/seahub/Dockerfile
+++ b/seahub/Dockerfile
@ -4,7 +4,7 @@ RUN apt-get update && \
    apt-get install -y software-properties-common wget && \
    add-apt-repository ppa:longsleep/golang-backports

-ENV SEAFILE_VERSION=11.0.12
+ENV SEAFILE_VERSION=11.0.13

 WORKDIR /tmp
 RUN wget https://raw.githubusercontent.com/haiwen/seafile-docker/master/build/seafile-build.sh
@ -18,13 +18,13 @@ RUN sed -i '/warning_if_seafile_not_running;/d' /tmp/seafile-server-${SEAFILE_VE

 FROM alpine:3.20.3 AS clean

-ENV SEAFILE_VERSION=11.0.12
+ENV SEAFILE_VERSION=11.0.13

 COPY --from=build /tmp/seafile-server-${SEAFILE_VERSION} /tmp/seafile-server-${SEAFILE_VERSION}

 RUN rm -rf /tmp/seafile-server-${SEAFILE_VERSION}/seahub/thirdpart

-FROM python:3.10.15-alpine3.20 AS pip
+FROM python:3.10.16-alpine3.20 AS pip

 RUN apk add --no-cache \
 mariadb-dev \
@ -47,8 +47,8 @@ future==1.0.0 \
 pillow==11.0.0 \
 captcha==0.6.0 \
 pyjwt==2.9.0 \
-mysqlclient==2.2.4 \
-django==4.2.16 \
+mysqlclient==2.2.6 \
+django==4.2.17 \
 django-pylibmc==0.6.1 \
 django-simple-captcha==0.6.0 \
 pycryptodome==3.21.0 \
@ -69,15 +69,15 @@ qrcode==8.0 \
 chardet==5.2.0 \
 openpyxl==3.1.5 \
 Markdown==3.7 \
-bleach==6.1.0 \
+bleach==6.2.0 \
 pypinyin==0.53.0 \
-PyMuPDF==1.24.11 \
+PyMuPDF==1.24.14 \
 pymysql==1.1.1

 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.15-alpine3.20
+FROM python:3.10.16-alpine3.20

 RUN apk add --no-cache \
 bash \
--- a/seahub/scripts/start.sh
+++ b/seahub/scripts/start.sh
@ -4,6 +4,30 @@ function init_seahub {
    /scripts/create_data_links.sh
    echo "{ \"email\": \"${SEAFILE_ADMIN_EMAIL}\",\"password\": \"${SEAFILE_ADMIN_PASSWORD}\"}" >/opt/seafile/conf/admin.txt
    sed -i 's@bind =.*@bind = "0.0.0.0:8000"@' /opt/seafile/conf/gunicorn.conf.py
+    /opt/seafile/seafile-server-latest/conf/seahub_settings.py
+}
+
+function init_csrf {
+    CONFIG_FILE="/opt/seafile/conf/seahub_settings.py"
+
+    # Check if CSRF_TRUSTED_ORIGINS is already set
+    if grep -q '^CSRF_TRUSTED_ORIGINS' "$CONFIG_FILE"; then
+        echo "CSRF_TRUSTED_ORIGINS is already set in $CONFIG_FILE"
+        return 0
+    fi
+
+    # Read SERVICE_URL from the config file
+    SERVICE_URL=$(grep '^SERVICE_URL' "$CONFIG_FILE" | sed 's/.*= *"//;s/"//')
+
+    # If SERVICE_URL is empty, exit with error
+    if [ -z "$SERVICE_URL" ]; then
+        echo "SERVICE_URL is not set in $CONFIG_FILE"
+        return 1
+    fi
+
+    # Append CSRF_TRUSTED_ORIGINS line to the config file
+    echo "CSRF_TRUSTED_ORIGINS = ['$SERVICE_URL']" >> "$CONFIG_FILE"
+    echo "CSRF_TRUSTED_ORIGINS has been set to ['$SERVICE_URL'] in $CONFIG_FILE"
 }

 function start_seahub {
@ -46,6 +70,7 @@ function logger {
 }

 init_seahub
+init_csrf
 start_socat &
 sleep 1
 start_seahub
Author	SHA1	Message	Date
Gerrit Gogel	21d67dd7ff	Merge pull request #349 from ggogel/renovate/python-3.10.x Update python Docker tag to v3.10.16	2025-01-04 12:52:04 +03:00
Gerrit Gogel	ed1844b512	Merge pull request #348 from ggogel/renovate/memcached-1.6.x Update memcached Docker tag to v1.6.34	2025-01-04 12:51:47 +03:00
Gerrit Gogel	845b684e56	Merge pull request #347 from ggogel/renovate/jinja2-3.1.x Update dependency jinja2 to v3.1.5	2025-01-04 12:51:31 +03:00
Gerrit Gogel	ce27d32684	Merge pull request #345 from ggogel/renovate/click-8.1.x Update dependency click to v8.1.8	2025-01-04 12:51:20 +03:00
Gerrit Gogel	fef05d209f	Merge pull request #340 from ggogel/renovate/pymupdf-1.24.x Update dependency PyMuPDF to v1.24.14	2025-01-04 12:49:31 +03:00
Gerrit Gogel	5d843f897f	Merge pull request #346 from ggogel/renovate/django-4.2.x Update dependency django to v4.2.17	2025-01-04 12:48:32 +03:00
renovate[bot]	73a5ead4f6	Update python Docker tag to v3.10.16	2025-01-04 09:48:27 +00:00
renovate[bot]	4faaf43510	Update memcached Docker tag to v1.6.34	2025-01-04 09:48:24 +00:00
renovate[bot]	de48de6087	Update dependency jinja2 to v3.1.5	2025-01-04 09:48:21 +00:00
renovate[bot]	5206d8d3c9	Update dependency django to v4.2.17	2025-01-04 09:48:18 +00:00
Gerrit Gogel	38083ff05a	Merge pull request #338 from ggogel/renovate/mariadb-10.11.x Update mariadb Docker tag to v10.11.10	2025-01-04 12:47:57 +03:00
Gerrit Gogel	a222c8284c	Merge pull request #337 from ggogel/renovate/mysqlclient-2.2.x Update dependency mysqlclient to v2.2.6	2025-01-04 12:47:42 +03:00
renovate[bot]	af73e121d1	Update dependency click to v8.1.8	2025-01-04 09:47:35 +00:00
Gerrit Gogel	5d523786a6	Merge pull request #336 from ggogel/renovate/json5-0.9.x Update dependency json5 to v0.9.28	2025-01-04 12:47:33 +03:00
Gerrit Gogel	28998bec72	Merge pull request #335 from ggogel/renovate/ggogel-seahub-media-11.0.x Update ggogel/seahub-media Docker tag to v11.0.13	2025-01-04 12:47:18 +03:00
Gerrit Gogel	4231ab65ff	Merge pull request #334 from ggogel/renovate/ggogel-seahub-11.0.x Update ggogel/seahub Docker tag to v11.0.13	2025-01-04 12:47:10 +03:00
Gerrit Gogel	d2541c914e	Merge pull request #333 from ggogel/renovate/ggogel-seafile-server-11.0.x Update ggogel/seafile-server Docker tag to v11.0.13	2025-01-04 12:47:02 +03:00
renovate[bot]	c16ad8aa68	Update dependency PyMuPDF to v1.24.14	2024-11-19 14:03:53 +00:00
renovate[bot]	100ccf15a0	Update mariadb Docker tag to v10.11.10	2024-11-15 04:49:14 +00:00
renovate[bot]	75b494ac73	Update dependency mysqlclient to v2.2.6	2024-11-13 07:23:44 +00:00
renovate[bot]	83b39c4cce	Update dependency json5 to v0.9.28	2024-11-11 19:57:33 +00:00
renovate[bot]	004d0a4625	Update ggogel/seahub-media Docker tag to v11.0.13	2024-11-04 19:42:48 +00:00
renovate[bot]	8d75fab4c9	Update ggogel/seahub Docker tag to v11.0.13	2024-11-04 19:42:44 +00:00
renovate[bot]	f50541663a	Update ggogel/seafile-server Docker tag to v11.0.13	2024-11-04 19:42:40 +00:00
Gerrit Gogel	0fc8abcd16	Merge pull request #332 from ggogel/renovate/haiwen-seahub-11.0.x Update Seafile to v11.0.13	2024-11-04 16:17:04 +01:00
Gerrit Gogel	c020357f20	Merge pull request #330 from ggogel/renovate/colorlog-6.x Update dependency colorlog to v6.9.0	2024-11-04 16:16:49 +01:00
Gerrit Gogel	2339b9215f	Merge pull request #329 from ggogel/renovate/bleach-6.x Update dependency bleach to v6.2.0	2024-11-04 16:16:36 +01:00
Gerrit Gogel	77d5294783	Merge pull request #327 from ggogel/renovate/actions-checkout-digest Update actions/checkout digest to 11bd719	2024-11-04 16:16:17 +01:00
Gerrit Gogel	af46b5a16f	Merge pull request #326 from ggogel/renovate/memcached-1.6.x Update memcached Docker tag to v1.6.32	2024-11-04 16:16:06 +01:00
Gerrit Gogel	81e93d7bcf	Merge pull request #325 from ggogel/renovate/pymupdf-1.24.x Update dependency PyMuPDF to v1.24.13	2024-11-04 16:15:56 +01:00
Gerrit Gogel	3af4b01099	Merge pull request #324 from ggogel/renovate/mysqlclient-2.2.x Update dependency mysqlclient to v2.2.5	2024-11-04 16:15:42 +01:00
renovate[bot]	158542b25c	Update Seafile to v11.0.13	2024-11-04 08:11:26 +00:00
renovate[bot]	c72f9bb248	Update dependency colorlog to v6.9.0	2024-10-29 20:47:30 +00:00
renovate[bot]	fdfe0b9a10	Update dependency bleach to v6.2.0	2024-10-29 20:47:27 +00:00
renovate[bot]	6120037c1b	Update dependency PyMuPDF to v1.24.13	2024-10-29 16:04:24 +00:00
renovate[bot]	47db3008c9	Update actions/checkout digest to 11bd719	2024-10-23 18:50:16 +00:00
renovate[bot]	479b1bf780	Update memcached Docker tag to v1.6.32	2024-10-21 21:26:57 +00:00
renovate[bot]	33a1457d92	Update dependency mysqlclient to v2.2.5	2024-10-20 12:05:00 +00:00
Gerrit Gogel	5772e2da3e	set CSRF_TRUSTED_ORIGINS to the value of SERVICE_URL	2024-10-19 23:16:49 +02:00