Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-23 15:21:35 +01:00
Code Issues Projects Releases Wiki Activity

upgrade nginx to 1.11.5

Browse Source
This commit is contained in:
Wenkai Yin 2016-11-02 15:49:28 +08:00
parent 35217b251c
commit 4fcfffeb47
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,7 +7,7 @@ make/common/config/jobservice/env
make/common/config/nginx/nginx.conf make/common/config/nginx/nginx.conf
make/common/config/nginx/cert/* make/common/config/nginx/cert/*
make/dev/ui/harbor_ui make/dev/ui/harbor_ui
make/dev//jobservice/harbor_jobservice make/dev/jobservice/harbor_jobservice
src/ui/ui src/ui/ui
src/jobservice/jobservice src/jobservice/jobservice
*.pyc *.pyc

2
README.md
View File

@ -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) * 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) * 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) * 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 ### Partners
<a href="https://www.shurenyun.com/" border="0" target="_blank"><img alt="DataMan" src="docs/img/dataman.png"></a> &nbsp; &nbsp; <a href="http://www.slamtec.com" target="_blank" border="0"><img alt="SlamTec" src="docs/img/slamteclogo.png"></a> <a href="https://www.shurenyun.com/" border="0" target="_blank"><img alt="DataMan" src="docs/img/dataman.png"></a> &nbsp; &nbsp; <a href="http://www.slamtec.com" target="_blank" border="0"><img alt="SlamTec" src="docs/img/slamteclogo.png"></a>

4
docs/installation_guide.md
View File

@ -185,7 +185,7 @@ Replace the first "80" to a customized port, e.g. 8888:80.
``` ```
proxy: proxy:
image: library/nginx:1.9 image: library/nginx:1.11.5
restart: always restart: always
volumes: volumes:
- ./config/nginx:/etc/nginx - ./config/nginx:/etc/nginx
@ -228,7 +228,7 @@ Replace the first "443" to a customized port, e.g. 4443:443.
``` ```
proxy: proxy:
image: library/nginx:1.9 image: library/nginx:1.11.5
restart: always restart: always
volumes: volumes:
- ./config/nginx:/etc/nginx - ./config/nginx:/etc/nginx

2
make/dev/docker-compose.yml
View File

@ -75,7 +75,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "jobservice" tag: "jobservice"
proxy: proxy:
image: library/nginx:1.9 image: library/nginx:1.11.5
restart: always restart: always
volumes: volumes:
- ../common/config/nginx:/etc/nginx - ../common/config/nginx:/etc/nginx

2
make/docker-compose.tpl
View File

@ -74,7 +74,7 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
tag: "jobservice" tag: "jobservice"
proxy: proxy:
image: nginx:1.9 image: nginx:1.11.5
container_name: nginx container_name: nginx
restart: always restart: always
volumes: volumes: