From 4fcfffeb4778ff1e0251964698ace23b6ae09be5 Mon Sep 17 00:00:00 2001 From: Wenkai Yin Date: Wed, 2 Nov 2016 15:49:28 +0800 Subject: [PATCH] upgrade nginx to 1.11.5 --- .gitignore | 2 +- README.md | 2 +- docs/installation_guide.md | 4 ++-- make/dev/docker-compose.yml | 2 +- make/docker-compose.tpl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index db3b37678..2cbbfa203 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ make/common/config/jobservice/env make/common/config/nginx/nginx.conf make/common/config/nginx/cert/* make/dev/ui/harbor_ui -make/dev//jobservice/harbor_jobservice +make/dev/jobservice/harbor_jobservice src/ui/ui src/jobservice/jobservice *.pyc diff --git a/README.md b/README.md index 65b41c49e..4c996cecb 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ This project uses open source components which have additional licensing terms. * Photon OS 1.0: [docker image](https://hub.docker.com/_/photon/), [license](https://github.com/vmware/photon/blob/master/COPYING) * Docker Registry 2.5: [docker image](https://hub.docker.com/_/registry/), [license](https://github.com/docker/distribution/blob/master/LICENSE) * MySQL 5.6: [docker image](https://hub.docker.com/_/mysql/), [license](https://github.com/docker-library/mysql/blob/master/LICENSE) -* NGINX 1.9: [docker image](https://hub.docker.com/_/nginx/), [license](https://github.com/nginxinc/docker-nginx/blob/master/LICENSE) +* NGINX 1.11.5: [docker image](https://hub.docker.com/_/nginx/), [license](https://github.com/nginxinc/docker-nginx/blob/master/LICENSE) ### Partners DataMan     SlamTec diff --git a/docs/installation_guide.md b/docs/installation_guide.md index f678c8cc7..e5c96ac3a 100644 --- a/docs/installation_guide.md +++ b/docs/installation_guide.md @@ -185,7 +185,7 @@ Replace the first "80" to a customized port, e.g. 8888:80. ``` proxy: - image: library/nginx:1.9 + image: library/nginx:1.11.5 restart: always volumes: - ./config/nginx:/etc/nginx @@ -228,7 +228,7 @@ Replace the first "443" to a customized port, e.g. 4443:443. ``` proxy: - image: library/nginx:1.9 + image: library/nginx:1.11.5 restart: always volumes: - ./config/nginx:/etc/nginx diff --git a/make/dev/docker-compose.yml b/make/dev/docker-compose.yml index b1c6608ea..1d8e9f858 100644 --- a/make/dev/docker-compose.yml +++ b/make/dev/docker-compose.yml @@ -75,7 +75,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "jobservice" proxy: - image: library/nginx:1.9 + image: library/nginx:1.11.5 restart: always volumes: - ../common/config/nginx:/etc/nginx diff --git a/make/docker-compose.tpl b/make/docker-compose.tpl index 4c5258198..b8bcdea6c 100644 --- a/make/docker-compose.tpl +++ b/make/docker-compose.tpl @@ -74,7 +74,7 @@ services: syslog-address: "tcp://127.0.0.1:1514" tag: "jobservice" proxy: - image: nginx:1.9 + image: nginx:1.11.5 container_name: nginx restart: always volumes: