Merge branch '10.0'

This commit is contained in:
Gerrit Gogel 2023-02-23 14:29:25 +01:00
commit d3360edc88
6 changed files with 20 additions and 20 deletions

View file

@ -1,16 +1,16 @@
[![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seafile-server?label=docker%20build%3A%20seafile-server%20)](https://hub.docker.com/r/ggogel/seafile-server) [![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seafile-server?label=docker%20build%3A%20seafile-server%20)](https://hub.docker.com/r/ggogel/seafile-server)
[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/ggogel/seafile-server?label=docker%20build%3A%20seafile-server%20)](https://hub.docker.com/r/ggogel/seafile-server) [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/ggogel/seafile-server?label=docker%20build%3A%20seafile-server%20)](https://hub.docker.com/r/ggogel/seafile-server)
[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/ggogel/seafile-server/9.0.10)](https://hub.docker.com/r/ggogel/seafile-server) [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/ggogel/seafile-server/10.0.0)](https://hub.docker.com/r/ggogel/seafile-server)
[![Docker Pulls](https://img.shields.io/docker/pulls/ggogel/seafile-server)](https://hub.docker.com/r/ggogel/seafile-server) [![Docker Pulls](https://img.shields.io/docker/pulls/ggogel/seafile-server)](https://hub.docker.com/r/ggogel/seafile-server)
[![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seahub?label=docker%20build%3A%20seahub)](https://hub.docker.com/r/ggogel/seahub) [![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seahub?label=docker%20build%3A%20seahub)](https://hub.docker.com/r/ggogel/seahub)
[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/ggogel/seahub?label=docker%20build%3A%20seahub)](https://hub.docker.com/r/ggogel/seahub) [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/ggogel/seahub?label=docker%20build%3A%20seahub)](https://hub.docker.com/r/ggogel/seahub)
[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/ggogel/seahub/9.0.10)](https://hub.docker.com/r/ggogel/seahub) [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/ggogel/seahub/10.0.0)](https://hub.docker.com/r/ggogel/seahub)
[![Docker Pulls](https://img.shields.io/docker/pulls/ggogel/seahub)](https://hub.docker.com/r/ggogel/seahub) [![Docker Pulls](https://img.shields.io/docker/pulls/ggogel/seahub)](https://hub.docker.com/r/ggogel/seahub)
[![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seahub-media?label=docker%20build%3A%20seahub-media)](https://hub.docker.com/r/ggogel/seahub-media) [![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seahub-media?label=docker%20build%3A%20seahub-media)](https://hub.docker.com/r/ggogel/seahub-media)
[![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/ggogel/seahub-media?label=docker%20build%3A%20seahub-media)](https://hub.docker.com/r/ggogel/seahub-media) [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/ggogel/seahub-media?label=docker%20build%3A%20seahub-media)](https://hub.docker.com/r/ggogel/seahub-media)
[![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/ggogel/seahub/9.0.10)](https://hub.docker.com/r/ggogel/seahub-media) [![Docker Image Version (tag latest semver)](https://img.shields.io/docker/v/ggogel/seahub/10.0.0)](https://hub.docker.com/r/ggogel/seahub-media)
[![Docker Pulls](https://img.shields.io/docker/pulls/ggogel/seahub-media)](https://hub.docker.com/r/ggogel/seahub-media) [![Docker Pulls](https://img.shields.io/docker/pulls/ggogel/seahub-media)](https://hub.docker.com/r/ggogel/seahub-media)
[![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seafile-caddy?label=docker%20build%3A%20seafile-caddy)](https://hub.docker.com/r/ggogel/seafile-caddy) [![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/ggogel/seafile-caddy?label=docker%20build%3A%20seafile-caddy)](https://hub.docker.com/r/ggogel/seafile-caddy)

View file

@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
seafile-server: seafile-server:
image: ggogel/seafile-server:9.0.10 image: ggogel/seafile-server:10.0.0
volumes: volumes:
- seafile-data:/shared - seafile-data:/shared
environment: environment:
@ -18,7 +18,7 @@ services:
endpoint_mode: dnsrr endpoint_mode: dnsrr
seahub: seahub:
image: ggogel/seahub:9.0.10 image: ggogel/seahub:10.0.0
volumes: volumes:
- seafile-data:/shared - seafile-data:/shared
- seahub-avatars:/shared/seafile/seahub-data/avatars - seahub-avatars:/shared/seafile/seahub-data/avatars

View file

@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
seafile-server: seafile-server:
image: ggogel/seafile-server:9.0.10 image: ggogel/seafile-server:10.0.0
volumes: volumes:
- seafile-data:/shared - seafile-data:/shared
environment: environment:
@ -18,7 +18,7 @@ services:
- seafile-net - seafile-net
seahub: seahub:
image: ggogel/seahub:9.0.10 image: ggogel/seahub:10.0.0
volumes: volumes:
- seafile-data:/shared - seafile-data:/shared
- seahub-avatars:/shared/seafile/seahub-data/avatars - seahub-avatars:/shared/seafile/seahub-data/avatars
@ -34,7 +34,7 @@ services:
- seafile-net - seafile-net
seahub-media: seahub-media:
image: ggogel/seahub-media:9.0.10 image: ggogel/seahub-media:10.0.0
volumes: volumes:
- seahub-avatars:/usr/share/caddy/media/avatars - seahub-avatars:/usr/share/caddy/media/avatars
- seahub-custom:/usr/share/caddy/media/custom - seahub-custom:/usr/share/caddy/media/custom

View file

@ -2,14 +2,14 @@ FROM alpine:3.16.3 AS get
RUN apk add --no-cache wget RUN apk add --no-cache wget
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.10 ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.0.0
RUN cd /tmp && \ RUN cd /tmp && \
wget https://download.seadrive.org/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz && \ wget https://download.seadrive.org/seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz && \
tar -zxvf 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 rm -f seafile-server_${SEAFILE_VERSION}_x86-64.tar.gz
FROM ubuntu:focal-20230126 FROM ubuntu:jammy-20230126
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y \ DEBIAN_FRONTEND=noninteractive apt-get install -y \
@ -34,7 +34,7 @@ python3-lxml \
RUN cp -r /usr/lib/python3/dist-packages/Cryptodome /usr/lib/python3/dist-packages/Crypto RUN cp -r /usr/lib/python3/dist-packages/Cryptodome /usr/lib/python3/dist-packages/Crypto
ENV SEAFILE_VERSION=9.0.10 ENV SEAFILE_VERSION=10.0.0
COPY --from=get /tmp/seafile-server-${SEAFILE_VERSION} /opt/seafile/seafile-server-${SEAFILE_VERSION} COPY --from=get /tmp/seafile-server-${SEAFILE_VERSION} /opt/seafile/seafile-server-${SEAFILE_VERSION}
COPY scripts /scripts COPY scripts /scripts

View file

@ -1,5 +1,5 @@
FROM alpine:3.16.3 AS get FROM alpine:3.16.3 AS get
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.10 ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.0.0
RUN apk add --no-cache wget RUN apk add --no-cache wget

View file

@ -1,5 +1,5 @@
FROM alpine:3.16.3 AS get FROM alpine:3.16.3 AS get
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.10 ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.0.0
RUN apk add --no-cache wget RUN apk add --no-cache wget
@ -29,15 +29,15 @@ libmemcached-dev
RUN python3 -m pip install --upgrade pip &&\ RUN python3 -m pip install --upgrade pip &&\
pip3 install --timeout=3600 \ pip3 install --timeout=3600 \
future \ future==0.18.* \
pillow \ pillow==9.3.* \
captcha \ captcha==0.4 \
pyjwt \ pyjwt==2.6.* \
mysqlclient \ mysqlclient==2.1.* \
django==3.2.16 \ django==3.2.16 \
django-pylibmc \ django-pylibmc \
django-simple-captcha \ django-simple-captcha==0.5.* \
pycryptodome==3.12.0 \ pycryptodome==3.16.* \
&& rm -r /root/.cache/pip && rm -r /root/.cache/pip
FROM python:3.8.16-alpine3.16 FROM python:3.8.16-alpine3.16