diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..85e7c1dfcb7fbb33f932c81024018cd8c10519da --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.idea/ diff --git a/Dockerfile b/Dockerfile index 7964914ea94d1a2a0c26212b950e6e31ea7d7c10..5213b5e83dfd322a9b62f9015b61df7d17075d61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,8 @@ RUN pip3 install \ termcolor \ colorlog \ psycopg2-binary \ - django==1.11.29 Pillow \ + django==1.11.29 \ + Pillow \ pylibmc \ captcha \ jinja2 \ @@ -30,13 +31,13 @@ ADD src/setenv.sh / ADD src/docker-entrypoint.sh / # set environment variables for locale -ENV LANG=C.UTF-8 -ENV LANGUAGE=C.UTF-8 -ENV LC_ALL=C.UTF-8 +ARG LANG=C.UTF-8 +ARG LANGUAGE=C.UTF-8 +ARG LC_ALL=C.UTF-8 # set environment variables for seafile -ENV ROOTPATH=/haiwen -ENV INSTALLPATH=$ROOTPATH/seafile-server-latest +ARG ROOTPATH=/haiwen +ARG INSTALLPATH=$ROOTPATH/seafile-server-latest ENV CCNET_CONF_DIR=$ROOTPATH/ccnet ENV SEAFILE_CENTRAL_CONF_DIR=$ROOTPATH/conf @@ -50,11 +51,9 @@ RUN addgroup --gid 1000 seafile && \ USER seafile VOLUME $SEAFILE_CONF_DIR -RUN wget https://download.seadrive.org/seafile-server_7.1.4_x86-64.tar.gz -O /tmp/seafile-server.tar.gz && \ +RUN wget https://download.seadrive.org/seafile-server_8.0.5_x86-64.tar.gz -O /tmp/seafile-server.tar.gz && \ tar -C /tmp/ -xzvf /tmp/seafile-server.tar.gz && \ rm /tmp/seafile-server.tar.gz && \ mv /tmp/seafile-server-* $INSTALLPATH -RUN rm -rf $INSTALLPATH/seahub/media/avatars -RUN ln -s $ROOTPATH/seahub-data/avatars $INSTALLPATH/seahub/media/avatars ENTRYPOINT ["/docker-entrypoint.sh"]