From b95d1b67d500d8dad1bc5041a25997bed229ebb5 Mon Sep 17 00:00:00 2001 From: lian Date: Fri, 30 Jun 2017 18:45:43 +0800 Subject: [PATCH] Revert "pip install --upgrade Pillow" This reverts commit 9303aa91fb6efc118ede0610034c6c2f637a515a. --- seafile-server-centos-7-amd64-http | 4 +--- seafile-server-ubuntu-16-04-amd64-http | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/seafile-server-centos-7-amd64-http b/seafile-server-centos-7-amd64-http index b88d651..0fa2e42 100644 --- a/seafile-server-centos-7-amd64-http +++ b/seafile-server-centos-7-amd64-http @@ -160,12 +160,10 @@ firewall-cmd --reload # extra packages for enterprise linux yum install epel-release -y yum upgrade -y -yum install python-setuptools python-pip MySQL-python python-memcached memcached python-urllib3 \ +yum install python-setuptools python-imaging MySQL-python python-memcached memcached python-urllib3 \ pwgen curl openssl python-ldap java-1.7.0-openjdk poppler-utils libreoffice python-requests \ libreoffice-headless libreoffice-pyuno wqy-microhei-fonts wqy-zenhei-fonts wqy-unibit-fonts -y -pip install --upgrade Pillow - # start memcached on system boot systemctl enable memcached diff --git a/seafile-server-ubuntu-16-04-amd64-http b/seafile-server-ubuntu-16-04-amd64-http index 9739c42..660c910 100644 --- a/seafile-server-ubuntu-16-04-amd64-http +++ b/seafile-server-ubuntu-16-04-amd64-http @@ -140,12 +140,10 @@ fi # Additional requirements # ------------------------------------------- apt-get update -apt-get install -y python2.7 sudo python-pip python-setuptools python-mysqldb python-ldap python-urllib3 \ +apt-get install -y python2.7 sudo python-pip python-setuptools python-imaging python-mysqldb python-ldap python-urllib3 \ openjdk-8-jre memcached python-memcache pwgen curl openssl poppler-utils libpython2.7 libreoffice \ libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy nginx python-requests -pip install --upgrade Pillow - rm /etc/nginx/sites-enabled/* cat > /etc/nginx/sites-available/seafile.conf <<'EOF'