Merge branch 'master' into dev

Makefile

@@ -263,7 +263,7 @@ package_offline: compile build modify_composefile
 			
 	@echo "pulling nginx and registry..."
 	$(DOCKERPULL) registry:2.5.0
-	$(DOCKERPULL) nginx:1.9
+	$(DOCKERPULL) nginx:1.11.5
 	
 	@echo "saving harbor docker image"
 	$(DOCKERSAVE) -o $(HARBORPKG)/$(DOCKERIMGFILE).$(VERSIONTAG).tgz \
@@ -271,7 +271,7 @@ package_offline: compile build modify_composefile
 		$(DOCKERIMAGENAME_LOG):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_DB):$(VERSIONTAG) \
 		$(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG) \
-		nginx:1.9 registry:2.5.0
+		nginx:1.11.5 registry:2.5.0
 
 	@$(TARCMD) -zcvf harbor-offline-installer-$(VERSIONTAG).tgz \
 	          --exclude=$(HARBORPKG)/common/db --exclude=$(HARBORPKG)/ubuntu \
@@ -329,7 +329,7 @@ cleanimage:
 	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_JOBSERVICE):$(VERSIONTAG)
 	- $(DOCKERRMIMAGE) -f $(DOCKERIMAGENAME_LOG):$(VERSIONTAG)
 	#- $(DOCKERRMIMAGE) -f registry:2.5.0
-	#- $(DOCKERRMIMAGE) -f nginx:1.9
+	#- $(DOCKERRMIMAGE) -f nginx:1.11.5
 
 cleandockercomposefile:
 	@echo "cleaning $(DOCKERCOMPOSEFILEPATH)/docker-compose.$(VERSIONTAG).yml"

docs/installation_guide_ova.md

@@ -22,7 +22,7 @@ This guide walks you through the steps about installing and configuring Harbor o
 
  ![ova](img/ova/ova03.png)
 
-5. Spefify a name and a location for the virtual appliance.  
+5. Specify a name and a location for the virtual appliance.  
 
  ![ova](img/ova/ova04.png)
 

make/kubernetes/dockerfiles/proxy-dockerfile

@@ -1,3 +1,3 @@
-FROM library/nginx:1.9
+FROM library/nginx:1.11.5
 
 ADD ./config/nginx /etc/nginx