mirror of
https://github.com/ggogel/seafile-containerized.git
synced 2025-02-23 13:32:15 +00:00
Merge branch '9.0.0'
This commit is contained in:
commit
de284e8e6c
|
@ -1,7 +1,7 @@
|
|||
version: '3.8'
|
||||
services:
|
||||
seafile-server:
|
||||
image: ggogel/seafile-server:8.0.7
|
||||
image: ggogel/seafile-server:9.0.0
|
||||
volumes:
|
||||
- seafile-data:/shared
|
||||
environment:
|
||||
|
@ -18,7 +18,7 @@ services:
|
|||
endpoint_mode: dnsrr
|
||||
|
||||
seahub:
|
||||
image: ggogel/seahub:8.0.7
|
||||
image: ggogel/seahub:9.0.0
|
||||
volumes:
|
||||
- seafile-data:/shared
|
||||
- seahub-avatars:/shared/seafile/seahub-data/avatars
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
version: '3.8'
|
||||
services:
|
||||
seafile-server:
|
||||
image: ggogel/seafile-server:8.0.7
|
||||
image: ggogel/seafile-server:9.0.0
|
||||
volumes:
|
||||
- seafile-data:/shared
|
||||
environment:
|
||||
|
@ -19,7 +19,7 @@ services:
|
|||
- seafile-net
|
||||
|
||||
seahub:
|
||||
image: ggogel/seahub:8.0.7
|
||||
image: ggogel/seahub:9.0.0
|
||||
volumes:
|
||||
- seafile-data:/shared
|
||||
- seahub-avatars:/shared/seafile/seahub-data/avatars
|
||||
|
@ -35,7 +35,7 @@ services:
|
|||
- seafile-net
|
||||
|
||||
seahub-media:
|
||||
image: ggogel/seahub-media:8.0.7
|
||||
image: ggogel/seahub-media:9.0.0
|
||||
volumes:
|
||||
- seahub-avatars:/usr/share/caddy/media/avatars
|
||||
- seahub-custom:/usr/share/caddy/media/custom
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
FROM alpine:3.13.5 AS get
|
||||
FROM alpine:3.13.6 AS get
|
||||
|
||||
RUN apk add --no-cache wget
|
||||
|
||||
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=8.0.7
|
||||
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0
|
||||
|
||||
RUN cd /tmp && \
|
||||
wget https://download.seadrive.org/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
|
||||
|
||||
FROM ubuntu:bionic-20210723
|
||||
FROM ubuntu:focal-20211006
|
||||
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||
|
@ -19,6 +19,8 @@ tzdata \
|
|||
psmisc \
|
||||
net-tools \
|
||||
libmariadb-dev \
|
||||
ldap-utils \
|
||||
ca-certificates \
|
||||
python3 \
|
||||
python3-click \
|
||||
python3-termcolor \
|
||||
|
@ -28,7 +30,7 @@ python3-jinja2 \
|
|||
python3-sqlalchemy \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV SEAFILE_VERSION=8.0.7
|
||||
ENV SEAFILE_VERSION=9.0.0
|
||||
|
||||
COPY --from=get /tmp/seafile-server-${SEAFILE_VERSION} /opt/seafile/seafile-server-${SEAFILE_VERSION}
|
||||
COPY scripts /scripts
|
||||
|
@ -40,7 +42,8 @@ ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafile.log &&\
|
|||
ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/controller.log &&\
|
||||
ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/ccnet.log &&\
|
||||
ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/gc.log &&\
|
||||
ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafdav.log
|
||||
ln -sf /opt/seafile/logs/common.log /opt/seafile/logs/seafdav.log &&\
|
||||
echo "TLS_REQCERT allow" >> /etc/ldap/ldap.conf
|
||||
|
||||
EXPOSE 8080 8082 8001
|
||||
|
||||
|
|
|
@ -30,7 +30,8 @@ dirs=(
|
|||
for d in ${dirs[*]}; do
|
||||
src=/shared/seafile/$d
|
||||
if [[ -e $src ]]; then
|
||||
rm -rf /opt/seafile/$d && ln -sf $src /opt/seafile
|
||||
rm -rf /opt/seafile/$d
|
||||
ln -sf $src /opt/seafile
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
FROM alpine:3.13.5 AS get
|
||||
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=8.0.7
|
||||
FROM alpine:3.13.6 AS get
|
||||
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0
|
||||
|
||||
RUN apk add --no-cache wget
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
FROM alpine:3.13.5 AS get
|
||||
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=8.0.7
|
||||
FROM alpine:3.13.6 AS get
|
||||
ENV SEAFILE_SERVER=seafile-server SEAFILE_VERSION=9.0.0
|
||||
|
||||
RUN apk add --no-cache wget
|
||||
|
||||
|
@ -12,7 +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.5 AS pip
|
||||
RUN sed -i '1s;^;from django.core.cache import cache\n;' /tmp/seafile-server-${SEAFILE_VERSION}/seahub/seahub/onlyoffice/views.py
|
||||
|
||||
FROM alpine:3.13.6 AS pip
|
||||
|
||||
RUN apk add --no-cache \
|
||||
python3-dev \
|
||||
|
@ -37,12 +39,12 @@ pillow \
|
|||
captcha \
|
||||
pyjwt \
|
||||
mysqlclient \
|
||||
django==2.2.* \
|
||||
django==3.2.9 \
|
||||
django-pylibmc \
|
||||
django-simple-captcha \
|
||||
&& rm -r /root/.cache/pip
|
||||
|
||||
FROM alpine:3.13.5
|
||||
FROM alpine:3.13.6
|
||||
|
||||
RUN apk add --no-cache \
|
||||
bash \
|
||||
|
@ -57,13 +59,14 @@ tiff \
|
|||
tk \
|
||||
mariadb-dev \
|
||||
libmemcached \
|
||||
netcat-openbsd
|
||||
netcat-openbsd \
|
||||
gcompat
|
||||
|
||||
COPY --from=get /tmp/seafile-server*/seahub /opt/seafile/seafile-server-latest/seahub
|
||||
COPY --from=get /tmp/seafile-server*/runtime /opt/seafile/seafile-server-latest/runtime
|
||||
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/lib64/python3.6/site-packages /opt/seafile/seafile-server-latest/seafile/lib64/python3.6/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 scripts /scripts
|
||||
|
||||
|
@ -72,7 +75,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/lib64/python3.6/site-packages:/opt/seafile/seafile-server-latest/seahub
|
||||
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 CCNET_CONF_DIR=/opt/seafile/conf/ccnet
|
||||
ENV SEAFILE_CONF_DIR=/opt/seafile/seafile-data
|
||||
ENV SEAFILE_CENTRAL_CONF_DIR=/opt/seafile/conf
|
||||
|
|
Loading…
Reference in a new issue