Merge branch 'alpine3.16'

This commit is contained in:
Gerrit Gogel 2022-09-23 13:09:38 +02:00
commit 2a393b4a98
4 changed files with 8 additions and 12 deletions

View file

@ -18,7 +18,7 @@ services:
- seafile-net - seafile-net
seahub: seahub:
image: ggogel/seahub:9.0.9 image: seahub-alpine2
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,4 +1,4 @@
FROM alpine:3.13.12 AS get FROM alpine:3.16.2 AS get
RUN apk add --no-cache wget RUN apk add --no-cache wget

View file

@ -1,4 +1,4 @@
FROM alpine:3.13.12 AS get FROM alpine:3.16.2 AS get
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.9 ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.9
RUN apk add --no-cache wget RUN apk add --no-cache wget

View file

@ -1,4 +1,4 @@
FROM alpine:3.13.12 AS get FROM alpine:3.16.2 AS get
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.9 ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.9
RUN apk add --no-cache wget RUN apk add --no-cache wget
@ -12,12 +12,9 @@ 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 '/warning_if_seafile_not_running;/d' /tmp/seafile-server-${SEAFILE_VERSION}/seahub.sh
FROM alpine:3.13.12 AS pip FROM python:3.8.14-alpine3.16 AS pip
RUN apk add --no-cache \ RUN apk add --no-cache \
python3-dev \
py3-pip \
py3-setuptools \
mariadb-dev \ mariadb-dev \
build-base \ build-base \
jpeg-dev \ jpeg-dev \
@ -43,12 +40,11 @@ django-simple-captcha \
pycryptodome==3.12.0 \ pycryptodome==3.12.0 \
&& rm -r /root/.cache/pip && rm -r /root/.cache/pip
FROM alpine:3.13.12 FROM python:3.8.14-alpine3.16
RUN apk add --no-cache \ RUN apk add --no-cache \
bash \ bash \
socat \ socat \
python3 \
jpeg \ jpeg \
zlib \ zlib \
freetype \ freetype \
@ -66,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*/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*/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=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 --from=pip /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
COPY scripts /scripts COPY scripts /scripts
RUN chmod u+x /scripts/* RUN chmod u+x /scripts/*
@ -74,7 +70,7 @@ RUN mkdir -p /opt/seafile/logs &&\
touch /opt/seafile/logs/seahub.log &&\ touch /opt/seafile/logs/seahub.log &&\
mkdir -p /opt/seafile/pids 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/lib/python3/site-packages:/opt/seafile/seafile-server-latest/seahub 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 CCNET_CONF_DIR=/opt/seafile/conf/ccnet ENV CCNET_CONF_DIR=/opt/seafile/conf/ccnet
ENV SEAFILE_CONF_DIR=/opt/seafile/seafile-data ENV SEAFILE_CONF_DIR=/opt/seafile/seafile-data
ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf