diff --git a/Makefile b/Makefile index b410a2b..93679a1 100644 --- a/Makefile +++ b/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" diff --git a/make/kubernetes/dockerfiles/proxy-dockerfile b/make/kubernetes/dockerfiles/proxy-dockerfile index fbc9672..5efb147 100644 --- a/make/kubernetes/dockerfiles/proxy-dockerfile +++ b/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