From fe779f7ee7c8ef512d3824a529b4f9fb61648ab1 Mon Sep 17 00:00:00 2001 From: Gerrit Gogel Date: Fri, 23 Sep 2022 00:05:40 +0200 Subject: [PATCH] update alpine to 3.16 --- compose/docker-compose.yml | 2 +- seafile-server/Dockerfile | 2 +- seahub-media/Dockerfile | 2 +- seahub/Dockerfile | 14 +++++--------- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index 5376a82..bb3e77a 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -18,7 +18,7 @@ services: - seafile-net seahub: - image: ggogel/seahub:9.0.9 + image: seahub-alpine2 volumes: - seafile-data:/shared - seahub-avatars:/shared/seafile/seahub-data/avatars diff --git a/seafile-server/Dockerfile b/seafile-server/Dockerfile index 43e03b9..904fd21 100644 --- a/seafile-server/Dockerfile +++ b/seafile-server/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.13.12 AS get +FROM alpine:3.16.2 AS get RUN apk add --no-cache wget diff --git a/seahub-media/Dockerfile b/seahub-media/Dockerfile index 596d534..91ab8cf 100644 --- a/seahub-media/Dockerfile +++ b/seahub-media/Dockerfile @@ -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 RUN apk add --no-cache wget diff --git a/seahub/Dockerfile b/seahub/Dockerfile index 8da1593..c247f04 100644 --- a/seahub/Dockerfile +++ b/seahub/Dockerfile @@ -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 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 -FROM alpine:3.13.12 AS pip +FROM python:3.8.14-alpine3.16 AS pip RUN apk add --no-cache \ -python3-dev \ -py3-pip \ -py3-setuptools \ mariadb-dev \ build-base \ jpeg-dev \ @@ -43,12 +40,11 @@ django-simple-captcha \ pycryptodome==3.12.0 \ && rm -r /root/.cache/pip -FROM alpine:3.13.12 +FROM python:3.8.14-alpine3.16 RUN apk add --no-cache \ bash \ socat \ -python3 \ jpeg \ zlib \ 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*/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/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 RUN chmod u+x /scripts/* @@ -74,7 +70,7 @@ RUN mkdir -p /opt/seafile/logs &&\ touch /opt/seafile/logs/seahub.log &&\ 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 SEAFILE_CONF_DIR=/opt/seafile/seafile-data ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf