From 400070158e9ef4b26936385f402ce1a71c824702 Mon Sep 17 00:00:00 2001
From: root <517046497@qq.com>
Date: Fri, 22 Jun 2018 03:47:58 -0400
Subject: [PATCH] 6.2.13 add the necessary additional packages [fixed] invlaid
 seafile package

---
 ci/ci.sh                     | 2 +-
 image/Makefile               | 2 +-
 image/pro_base/Dockerfile    | 5 +++--
 image/pro_seafile/Dockerfile | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ci/ci.sh b/ci/ci.sh
index 522491d..d186dec 100755
--- a/ci/ci.sh
+++ b/ci/ci.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=6.2.10
+version=6.2.13
 set -e -x
 ./ci/install_deps.sh
 
diff --git a/image/Makefile b/image/Makefile
index 52f4e2d..65eb0b2 100644
--- a/image/Makefile
+++ b/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
diff --git a/image/pro_base/Dockerfile b/image/pro_base/Dockerfile
index 48a6042..58e37df 100644
--- a/image/pro_base/Dockerfile
+++ b/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 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
diff --git a/image/pro_seafile/Dockerfile b/image/pro_seafile/Dockerfile
index 1b30977..1ad9a9a 100644
--- a/image/pro_seafile/Dockerfile
+++ b/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