Merge pull request #79 from haiwen/6.2.13-t

6.2.13 t

ci/ci.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=6.2.10
+version=6.2.13
 set -e -x
 ./ci/install_deps.sh
 

image/Makefile

@@ -1,4 +1,4 @@
-server_version=6.2.10
+server_version=6.2.13
 
 base_image=seafileltd/base:16.04
 base_image_squashed=seafileltd/base:16.04-squashed

image/pro_base/Dockerfile

@@ -7,8 +7,9 @@ RUN apt update
 RUN apt-get install -y openjdk-8-jre libmemcached-dev zlib1g-dev pwgen curl openssl poppler-utils libpython2.7 libreoffice \
 libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy python-requests
 
-RUN apt-get install -y python-pip python-setuptools python-urllib3
+RUN apt-get install -y tzdata python-pip python-setuptools python-urllib3 python-ldap python-ceph
+
+RUN pip install pylibmc django-pylibmc boto twilio oss2
 
-RUN pip install oss2 django-pylibmc
 
 RUN apt clean

image/pro_seafile/Dockerfile

@@ -1,13 +1,13 @@
 FROM seafileltd/pro-base:16.04
 WORKDIR /opt/seafile
 
-ENV SEAFILE_VERSION=6.2.10 SEAFILE_SERVER=seafile-pro-server
+ENV SEAFILE_VERSION=6.2.13 SEAFILE_SERVER=seafile-pro-server
 
 RUN mkdir -p /etc/my_init.d
 
 RUN mkdir -p /opt/seafile/
 
-RUN curl -sSL -G -d "p=/seafile-pro-server_${SEAFILE_VERSION}_x86-64.tar.gz&dl=1" https://download.seafile.top/d/8c29766a64d24122936f/files/ \
+RUN curl -sSL -G -d "p=/seafile-pro-server_${SEAFILE_VERSION}_x86-64_Ubuntu.tar.gz&dl=1" https://download.seafile.top/d/8c29766a64d24122936f/files/ \
     | tar xzf - -C /opt/seafile/
 
 ADD scripts/create_data_links.sh /etc/my_init.d/01_create_data_links.sh

scripts/create_data_links.sh

@@ -7,6 +7,17 @@ if [[ $SEAFILE_BOOTSRAP != "" ]]; then
     exit 0
 fi
 
+if [[ $TIME_ZONE != "" ]]; then
+    time_zone=/usr/share/zoneinfo/$TIME_ZONE
+    if [[ ! -e $time_zone ]]; then
+        echo "invalid time zone"
+        exit 1
+    else
+        ln -snf $time_zone /etc/localtime
+        echo "$TIME_ZONE" > /etc/timezone
+    fi
+fi
+
 dirs=(
     conf
     ccnet