From 84b47b409263a08d0e8cc72c420b1e9d4fc863f0 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 1 Aug 2019 14:45:49 +0200
Subject: [PATCH] Updated seafile

---
 Dockerfile           | 5 ++---
 docker-entrypoint.sh | 7 +------
 setenv.sh            | 9 ++++++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 43a5297..4724c02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN pip2 install --upgrade pip && \
     pylibmc \
     django-pylibmc
 
-RUN wget https://download.seadrive.org/seafile-server_7.0.3_x86-64.tar.gz -O /seafile-server.tar.gz && \
+RUN wget https://download.seadrive.org/seafile-server_7.0.4_x86-64.tar.gz -O /seafile-server.tar.gz && \
     mkdir /haiwen && \
     tar xzvf /seafile-server.tar.gz && \
     rm /seafile-server.tar.gz
@@ -32,10 +32,9 @@ RUN mv /seafile-server-* /haiwen/seafile-server-latest
 RUN rm -rf /haiwen/seafile-server-latest/seahub/media/avatars
 RUN ln -s /haiwen/seahub-data/avatars /haiwen/seafile-server-latest/seahub/media/avatars
 
+ADD setenv.sh /
 ADD docker-entrypoint.sh /
 
-ADD setenv.sh /haiwen/seafile-server-latest/seahub/
-
 ENTRYPOINT ["/usr/local/bin/tini", "--"]
 
 CMD ["/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4cb0a34..e1eecfa 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
-ROOTPATH=/haiwen
-INSTALLPATH=$ROOTPATH/seafile-server-latest
-export CCNET_CONF_DIR=$ROOTPATH/ccnet
-export SEAFILE_CENTRAL_CONF_DIR=$ROOTPATH/conf
-export SEAFILE_CONF_DIR=$ROOTPATH/seafile-data
-export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.7/site-packages:${INSTALLPATH}/seafile/lib64/python2.7/site-packages:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH
+source setenv.sh
 
 $INSTALLPATH/seafile.sh start
 $INSTALLPATH/seahub.sh start
diff --git a/setenv.sh b/setenv.sh
index 8c84713..68bdf66 100644
--- a/setenv.sh
+++ b/setenv.sh
@@ -1,3 +1,6 @@
-export CCNET_CONF_DIR=/haiwen/conf
-export SEAFILE_CONF_DIR=/haiwen/seafile-data
-export PYTHONPATH=/haiwen/seafile-server-latest/seafile/lib64/python2.7/site-packages/:thirdpart:$PYTHONPATH
+export ROOTPATH=/haiwen
+export INSTALLPATH=$ROOTPATH/seafile-server-latest
+export CCNET_CONF_DIR=$ROOTPATH/ccnet
+export SEAFILE_CENTRAL_CONF_DIR=$ROOTPATH/conf
+export SEAFILE_CONF_DIR=$ROOTPATH/seafile-data
+export PYTHONPATH=${INSTALLPATH}/seafile/lib/python2.7/site-packages:${INSTALLPATH}/seafile/lib64/python2.7/site-packages:${INSTALLPATH}/seahub/thirdpart:$PYTHONPATH
-- 
GitLab