Merge branch '10.0'

This commit is contained in:
Gerrit Gogel 2023-02-23 14:46:38 +01:00
commit adf679b3d0
3 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
FROM alpine:3.16.3 AS get
FROM alpine:3.17.2 AS get
RUN apk add --no-cache wget

View file

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

View file

@ -1,4 +1,4 @@
FROM alpine:3.16.3 AS get
FROM alpine:3.17.2 AS get
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=10.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 python:3.8.16-alpine3.16 AS pip
FROM python:3.10.10-alpine3.17 AS pip
RUN apk add --no-cache \
mariadb-dev \
@ -40,7 +40,7 @@ django-simple-captcha==0.5.* \
pycryptodome==3.16.* \
&& rm -r /root/.cache/pip
FROM python:3.8.16-alpine3.16
FROM python:3.10.10-alpine3.17
RUN apk add --no-cache \
bash \
@ -62,7 +62,7 @@ COPY --from=get /tmp/seafile-server*/runtime /opt/seafile/seafile-server-latest/
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.8/site-packages /usr/local/lib/python3.8/site-packages
COPY --from=pip /usr/local/lib/python3.10/site-packages /usr/local/lib/python3.10/site-packages
COPY scripts /scripts
RUN chmod u+x /scripts/*
@ -70,7 +70,7 @@ RUN mkdir -p /opt/seafile/logs &&\
touch /opt/seafile/logs/seahub.log &&\
mkdir -p /opt/seafile/pids
ENV PYTHONPATH=/usr/local/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 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 CCNET_CONF_DIR=/opt/seafile/conf/ccnet
ENV SEAFILE_CONF_DIR=/opt/seafile/seafile-data
ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf