Baseimage 0.11 (#119)

* update baseimages to 0.10.2 * update baseimage to 0.11 * del the files by the local test procuced. * update windows install instructions closes #123 * Pass arguments to seaf-gc This will allow users to run seaf-gc with parameters like ``-D`` or ``-r`` * Apply pass argument patch to all gc scripts * modified the 16.04 to 18.04 * updata comment
2024-11-16 09:01:38 +00:00 · 2018-12-13 15:18:34 +08:00 · 2018-12-13 15:18:34 +08:00 · 78326e41f6
parent 4c12ef096d
commit 78326e41f6
12 changed files with 59 additions and 37 deletions
--- a/ci/ci.sh
+++ b/ci/ci.sh
@ -1,6 +1,6 @@
 #!/bin/bash

-version=6.3.3
+version=6.3.7
 set -e -x
 ./ci/install_deps.sh

--- a/cluster/image/Makefile
+++ b/cluster/image/Makefile
@ -1,9 +1,9 @@
 server_version=6.3.7

-base_image=seafileltd/base:16.04
-base_image_squashed=seafileltd/base:16.04-squashed
-pro_base_image=seafileltd/cluster-base:16.04
-pro_base_image_squashed=seafileltd/cluster-base:16.04-squashed
+base_image=seafileltd/cluster-base:18.04
+base_image_squashed=seafileltd/cluster-base:18.04-squashed
+pro_base_image=seafileltd/cluster-pro-base:18.04
+pro_base_image_squashed=seafileltd/cluster-pro-base:18.04-squashed
 server_image=seafileltd/seafile:$(server_version)
 server_image_squashed=seafileltd/seafile:$(server_version)-squashed
 pro_server_image=seafileltd/cluster-seafile-pro:$(server_version)
@ -17,9 +17,9 @@ all:
 	@echo

 base:
-	docker pull phusion/baseimage:0.9.19
-	docker-squash --tag phusion/baseimage:latest phusion/baseimage:0.9.19
-	docker tag phusion/baseimage:latest phusion/baseimage:0.9.19
+	docker pull phusion/baseimage:0.11
+	docker-squash --tag phusion/baseimage:latest phusion/baseimage:0.11
+	docker tag phusion/baseimage:latest phusion/baseimage:0.11
 	cd base && docker build -t $(base_image) .
 	docker-squash --tag $(base_image_squashed) $(base_image)
 	docker tag $(base_image_squashed) $(base_image)
--- a/cluster/image/base/Dockerfile
+++ b/cluster/image/base/Dockerfile
@ -1,6 +1,6 @@
-# Lastet phusion baseimage as of 20180412, based on ubuntu 16.04
+# Lastet phusion baseimage as of 20180412, based on ubuntu 18.04
 # See https://hub.docker.com/r/phusion/baseimage/tags/
-FROM phusion/baseimage:0.10.1
+FROM phusion/baseimage:0.11

 ENV UPDATED_AT=20180412 \
    DEBIAN_FRONTEND=noninteractive
@ -15,7 +15,7 @@ RUN apt-get install -qq -y vim htop net-tools psmisc git wget curl
 # Guidline for installing python libs: if a lib has C-compoment (e.g.
 # python-imaging depends on libjpeg/libpng), we install it use apt-get.
 # Otherwise we install it with pip.
-RUN apt-get install -y python2.7-dev python-imaging python-ldap python-mysqldb
+RUN apt-get install -y python2.7-dev python-ldap python-mysqldb libmemcached-dev zlib1g-dev gcc
 RUN curl -sSL -o /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
    python /tmp/get-pip.py && \
    rm -rf /tmp/get-pip.py && \
--- a/cluster/image/base/requirements.txt
+++ b/cluster/image/base/requirements.txt
@ -9,7 +9,8 @@ colorlog==2.7.0
 Jinja2==2.8
 MarkupSafe==0.23          # via jinja2
 prettytable==0.7.2
-python-memcached==1.58
-six==1.10.0               # via python-memcached
 termcolor==1.1.0
 urllib3==1.19
+Pillow==4.3.0
+pylibmc
+django-pylibmc
--- a/cluster/image/pro_base/Dockerfile
+++ b/cluster/image/pro_base/Dockerfile
@ -1,7 +1,12 @@
-FROM seafileltd/base:16.04
+FROM seafileltd/cluster-base:18.04

 # syslog-ng and syslog-forwarder would mess up the container stdout, not good
 # when debugging/upgrading.
+
+# Fixing the "Sub-process /usr/bin/dpkg returned an error code (1)", 
+# when RUN apt-get
+RUN mkdir -p /usr/share/man/man1
+
 RUN apt update

 RUN apt-get install -y openjdk-8-jre libmemcached-dev zlib1g-dev pwgen curl openssl poppler-utils libpython2.7 libreoffice \
@ -9,7 +14,12 @@ libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy py

 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
-
+# The S3 storage, oss storage and psd online preview etc, 
+# depends on the python-backages as follow:
+RUN pip install boto==2.43.0 \ 
+    oss2==2.3.0 \ 
+    psd-tools==1.4 \ 
+    pycryptodome==3.7.2 \ 
+    twilio==5.7.0

 RUN apt clean
--- a/cluster/image/pro_seafile/Dockerfile
+++ b/cluster/image/pro_seafile/Dockerfile
@ -1,4 +1,4 @@
-FROM seafileltd/cluster-base:16.04
+FROM seafileltd/cluster-pro-base:18.04
 WORKDIR /opt/seafile

 ENV SEAFILE_VERSION=6.3.7 SEAFILE_SERVER=seafile-pro-server
--- a/image/Makefile
+++ b/image/Makefile
@ -1,9 +1,9 @@
-server_version=6.3.3
+server_version=6.3.7

-base_image=seafileltd/base:16.04
-base_image_squashed=seafileltd/base:16.04-squashed
-pro_base_image=seafileltd/pro-base:16.04
-pro_base_image_squashed=seafileltd/pro-base:16.04-squashed
+base_image=seafileltd/base:18.04
+base_image_squashed=seafileltd/base:18.04-squashed
+pro_base_image=seafileltd/pro-base:18.04
+pro_base_image_squashed=seafileltd/pro-base:18.04-squashed
 server_image=seafileltd/seafile:$(server_version)
 server_image_squashed=seafileltd/seafile:$(server_version)-squashed
 pro_server_image=seafileltd/seafile-pro:$(server_version)
@ -17,9 +17,9 @@ all:
 	@echo

 base:
-	docker pull phusion/baseimage:0.9.19
-	docker-squash --tag phusion/baseimage:latest phusion/baseimage:0.9.19
-	docker tag phusion/baseimage:latest phusion/baseimage:0.9.19
+	docker pull phusion/baseimage:0.11
+	docker-squash --tag phusion/baseimage:latest phusion/baseimage:0.11
+	docker tag phusion/baseimage:latest phusion/baseimage:0.11
 	cd base && docker build -t $(base_image) .
 	docker-squash --tag $(base_image_squashed) $(base_image)
 	docker tag $(base_image_squashed) $(base_image)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@ -1,6 +1,6 @@
-# Lastet phusion baseimage as of 20180412, based on ubuntu 16.04
+# Lastet phusion baseimage as of 20180412, based on ubuntu 18.04
 # See https://hub.docker.com/r/phusion/baseimage/tags/
-FROM phusion/baseimage:0.10.1
+FROM phusion/baseimage:0.11

 ENV UPDATED_AT=20180412 \
    DEBIAN_FRONTEND=noninteractive
@ -15,7 +15,7 @@ RUN apt-get install -qq -y vim htop net-tools psmisc git wget curl
 # Guidline for installing python libs: if a lib has C-compoment (e.g.
 # python-imaging depends on libjpeg/libpng), we install it use apt-get.
 # Otherwise we install it with pip.
-RUN apt-get install -y python2.7-dev python-imaging python-ldap python-mysqldb
+RUN apt-get install -y python2.7-dev python-ldap python-mysqldb zlib1g-dev libmemcached-dev gcc
 RUN curl -sSL -o /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py && \
    python /tmp/get-pip.py && \
    rm -rf /tmp/get-pip.py && \
--- a/image/base/requirements.txt
+++ b/image/base/requirements.txt
@ -9,7 +9,8 @@ colorlog==2.7.0
 Jinja2==2.8
 MarkupSafe==0.23          # via jinja2
 prettytable==0.7.2
-python-memcached==1.58
-six==1.10.0               # via python-memcached
 termcolor==1.1.0
 urllib3==1.19
+Pillow==4.3.0
+pylibmc==1.6.0
+django-pylibmc==0.6.1
--- a/image/pro_base/Dockerfile
+++ b/image/pro_base/Dockerfile
@ -1,7 +1,12 @@
-FROM seafileltd/base:16.04
+FROM seafileltd/base:18.04

 # syslog-ng and syslog-forwarder would mess up the container stdout, not good
 # when debugging/upgrading.
+
+# Fixing the "Sub-process /usr/bin/dpkg returned an error code (1)", 
+# when RUN apt-get
+RUN mkdir -p /usr/share/man/man1
+
 RUN apt update

 RUN apt-get install -y openjdk-8-jre libmemcached-dev zlib1g-dev pwgen curl openssl poppler-utils libpython2.7 libreoffice \
@ -9,7 +14,12 @@ libreoffice-script-provider-python ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy py

 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
-
+# The S3 storage, oss storage and psd online preview etc, 
+# depends on the python-backages as follow:
+RUN pip install boto==2.43.0 \ 
+    oss2==2.3.0 \ 
+    psd-tools==1.4 \ 
+    pycryptodome==3.7.2 \ 
+    twilio==5.7.0

 RUN apt clean
--- a/image/pro_seafile/Dockerfile
+++ b/image/pro_seafile/Dockerfile
@ -1,13 +1,13 @@
-FROM seafileltd/pro-base:16.04
+FROM seafileltd/pro-base:18.04
 WORKDIR /opt/seafile

-ENV SEAFILE_VERSION=6.2.13 SEAFILE_SERVER=seafile-pro-server
+ENV SEAFILE_VERSION=6.3.7 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_Ubuntu.tar.gz&dl=1" https://download.seafile.top/d/8c29766a64d24122936f/files/ \
+RUN curl -sSL -G -d "p=/pro/seafile-pro-server_${SEAFILE_VERSION}_x86-64_Ubuntu.tar.gz&dl=1" https://download.seafile.com/d/6e5297246c/files/ \
    | tar xzf - -C /opt/seafile/

 ADD scripts/create_data_links.sh /etc/my_init.d/01_create_data_links.sh
--- a/image/seafile/Dockerfile
+++ b/image/seafile/Dockerfile
@ -1,4 +1,4 @@
-FROM seafileltd/base:16.04
+FROM seafileltd/base:18.04
 WORKDIR /opt/seafile

 RUN mkdir -p /etc/my_init.d