Skip to content

Commit

Permalink
Merge pull request #129 from haiwen/6.3.9-pro-t
Browse files Browse the repository at this point in the history
6.3.9 pro t
  • Loading branch information
renfeipeng authored Dec 19, 2018
2 parents 2c102bd + 9d5bc91 commit 6e71d47
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/ci.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ server {
client_max_body_size 0;
proxy_connect_timeout 36000s;
proxy_read_timeout 36000s;
proxy_request_buffering off;
}

location /seafdav {
Expand Down
2 changes: 1 addition & 1 deletion image/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server_version=6.3.7
server_version=6.3.9

base_image=seafileltd/base:18.04
base_image_squashed=seafileltd/base:18.04-squashed
Expand Down
4 changes: 3 additions & 1 deletion image/pro_seafile/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM seafileltd/pro-base:18.04
WORKDIR /opt/seafile

ENV SEAFILE_VERSION=6.3.7 SEAFILE_SERVER=seafile-pro-server
ENV SEAFILE_VERSION=6.3.9 SEAFILE_SERVER=seafile-pro-server

RUN mkdir -p /etc/my_init.d

Expand All @@ -15,4 +15,6 @@ ADD scripts/create_data_links.sh /etc/my_init.d/01_create_data_links.sh
COPY scripts /scripts
COPY templates /templates

EXPOSE 80

CMD ["/sbin/my_init", "--", "/scripts/start.py"]
1 change: 1 addition & 0 deletions image/pro_seafile/templates/seafile.nginx.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ server {
client_max_body_size 0;
proxy_connect_timeout 36000s;
proxy_read_timeout 36000s;
proxy_request_buffering off;
}

location /seafdav {
Expand Down
1 change: 1 addition & 0 deletions image/seafile/templates/seafile.nginx.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ server {
client_max_body_size 0;
proxy_connect_timeout 36000s;
proxy_read_timeout 36000s;
proxy_request_buffering off;
}

location /seafdav {
Expand Down

0 comments on commit 6e71d47

Please sign in to comment.