diff --git a/Dockerfile b/Dockerfile index 43a5297db0be0e21f4fb84fd509b8c660aa32713..4724c025d65841f947811dc9e4d38a9b4b86c075 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 4cb0a34ae3c42a95edee1135a8e7a35b3dd74873..e1eecfa2de352350747f2e00a296456c513c1126 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 8c8471350eea1b53077a323e809d3472eb7076ee..68bdf6697a532fbf7ccf69e775145bf9866e6d74 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