.drone.yml

@@ -6,12 +6,12 @@ pipeline:
      - nginx -t
  docker:
     image: plugins/docker
-    repo: repo.shimun.net/shimun/seafile:git
+    repo: repo.shimun.net/shimun/seafile
     tag: riffol
     registry: repo.shimun.net
     storage_path: /drone/.docker
     secrets: ["docker_username", "docker_password"]
     storage_path: /drone/cache/.docker
-    cache_from: ["repo.shimun.net/shimun/seafile:git"]
+    cache_from: ["repo.shimun.net/shimun/seafile", "repo.shimun.net/shimun/seafile:nginx-deb", "repo.shimun.net/shimun/seafile:alpine"]
     use_cache: true
     pull_image: false

Dockerfile

@@ -1,6 +1,6 @@
 FROM rust:1.36-slim AS riffol_build
 
-RUN cargo install --git https://github.com/shimunn/riffol.git --branch print_error --locked
+RUN cargo install --git https://github.com/shimunn/riffol.git --branch print_error
 
 FROM nginx:mainline
 
@@ -12,13 +12,13 @@ ENV SEAF=/opt/seafile
 
 COPY requirements.txt /tmp/requirements.txt
 
-RUN apt update && apt install locales -y && apt install -y procps libmariadb-dev-compat openssl python2.7 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools python3 sqlite3 python3 python3-pip python3-setuptools python3-ldap \
+RUN apt update && apt install locales -y && apt install -y --no-install-recommends procps openssl python2.7 sqlite3 python-mysqldb python-pil curl libjansson4 libfuse2 python-pip python-pip-whl python-setuptools python3 sqlite3 python3 python3-pip python3-setuptools python3-ldap \
     && rm -rf /var/lib/apt/lists/* /tmp/requirements.txt
     
 RUN python3 -m pip install --upgrade pip && rm -r /root/.cache/pip
 
 RUN pip3 install --timeout=3600 click termcolor colorlog pymysql \
-    django && rm -r /root/.cache/pip
+    django==1.11.29 && rm -r /root/.cache/pip
 
 ADD https://raw.githubusercontent.com/haiwen/seahub/master/requirements.txt /tmp/hub-requirements.txt
 
@@ -45,10 +45,6 @@ COPY scripts/setup.sh /usr/bin/setup
 RUN ulimit -n 30000 && mkdir -p $SEAF/pids && \
     chmod +x /usr/local/sbin/upgrade /usr/bin/setup
 
-RUN pip2 install requests scriptine
-
 ENV SEAF_UPGRADE_INTERVAL=3
 
-HEALTHCHECK --interval=30s --timeout=30s --start-period=30s CMD (curl http://localhost:8000 || (echo "failed seahub"; exit 1)) && (curl http://localhost:8082 || (echo "failed seafhttp"; exit 1)) && (bash -c '[ $(curl --silent --output /dev/null --write-out "%{http_code}" http://localhost:8080) -eq 401 ]' || (echo "failed seafdav"; exit 1)) || exit 1  
-
 ENTRYPOINT ["/usr/sbin/riffol", "-f", "/etc/riffol.conf"]

nginx/seafile/seafdav.conf

@@ -1,5 +1,18 @@
 location /seafdav {
-	proxy_pass http://webdav;
+	fastcgi_pass    webdav;
+	fastcgi_keep_conn on;
+	fastcgi_param   SCRIPT_FILENAME     $document_root$fastcgi_script_name;
+	fastcgi_param   PATH_INFO           $fastcgi_script_name;
+
+	fastcgi_param   SERVER_PROTOCOL     $server_protocol;
+	fastcgi_param   QUERY_STRING        $query_string;
+	fastcgi_param   REQUEST_METHOD      $request_method;
+	fastcgi_param   CONTENT_TYPE        $content_type;
+	fastcgi_param   CONTENT_LENGTH      $content_length;
+	fastcgi_param   SERVER_ADDR         $server_addr;
+	fastcgi_param   SERVER_PORT         $server_port;
+	fastcgi_param   SERVER_NAME         $server_name;
+
 	client_max_body_size 0;
 
 }

requirements.txt

@@ -4,4 +4,3 @@ setuptools
 simplejson
 python-memcached
 urllib3
-lxml