DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nginx image, go to 1.13.7 and e2e image (#5011)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-02-04 14:02:10 -03:00 committed by GitHub
parent 6ab10fa68d
commit a16ed1b01f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -60,7 +60,7 @@ ARCH ?= $(shell go env GOARCH)
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx
BASE_TAG ?= 26f574dc279aa853736d7f7249965e90e47171d6 BASE_TAG ?= 6ab10fa68ddea57fa51b37284b2678ac073ae74b
GOARCH=$(ARCH) GOARCH=$(ARCH)
GOBUILD_FLAGS := -v GOBUILD_FLAGS := -v

2
build/images/ingress-controller/build-ingress-controller.sh
View file

@ -67,7 +67,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
chmod +x /usr/local/bin/gimme chmod +x /usr/local/bin/gimme
eval "$(gimme 1.13.6)" eval "$(gimme 1.13.7)"
export GOPATH="/tmp/go" export GOPATH="/tmp/go"

2
build/images/nginx/build-nginx.sh
View file

@ -70,7 +70,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
chmod +x /usr/local/bin/gimme chmod +x /usr/local/bin/gimme
eval "$(gimme 1.13.6)" eval "$(gimme 1.13.7)"
git clone https://github.com/kubernetes/ingress-nginx git clone https://github.com/kubernetes/ingress-nginx

2
build/run-in-docker.sh
View file

@ -34,7 +34,7 @@ function cleanup {
} }
trap cleanup EXIT trap cleanup EXIT
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873 E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02042020-08e19a278
DOCKER_OPTS=${DOCKER_OPTS:-} DOCKER_OPTS=${DOCKER_OPTS:-}

2
images/e2e/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:26f574dc279aa853736d7f7249965e90e47171d6 FROM quay.io/kubernetes-ingress-controller/nginx-amd64:6ab10fa68ddea57fa51b37284b2678ac073ae74b
ARG GOLANG_VERSION ARG GOLANG_VERSION
ARG GOLANG_SHA ARG GOLANG_SHA

4
images/e2e/Makefile
View file

@ -26,8 +26,8 @@ docker-build:
--progress plain \ --progress plain \
--build-arg K8S_RELEASE=v1.15.7 \ --build-arg K8S_RELEASE=v1.15.7 \
--build-arg ETCD_VERSION=v3.3.18 \ --build-arg ETCD_VERSION=v3.3.18 \
--build-arg GOLANG_VERSION=1.13.6 \ --build-arg GOLANG_VERSION=1.13.7 \
--build-arg GOLANG_SHA=aae5be954bdc40bcf8006eb77e8d8a5dde412722bc8effcdaf9772620d06420c \ --build-arg GOLANG_SHA=e4ad42cc5f5c19521fbbbde3680995f2546110b5c6aa2b48c3754ff7af9b41f4 \
--build-arg RESTY_CLI_VERSION=0.25rc2 \ --build-arg RESTY_CLI_VERSION=0.25rc2 \
--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \ --build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
-t $(IMAGE):$(TAG) . -t $(IMAGE):$(TAG) .

2
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v01262020-44fb2a873 AS BASE FROM quay.io/kubernetes-ingress-controller/e2e:v02042020-08e19a278 AS BASE
FROM alpine:3.11 FROM alpine:3.11