Use an existing e2e image
This commit is contained in:
parent
45ba1672cf
commit
e815370a13
3 changed files with 30 additions and 3 deletions
|
@ -40,9 +40,9 @@ if [ "$missing" = true ];then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
||||
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v07282018-45ba1672c
|
||||
|
||||
docker build -t ingress-nginx:build build
|
||||
DOCKER_OPTS=${DOCKER_OPTS:-""}
|
||||
|
||||
FLAGS=$@
|
||||
|
||||
|
@ -74,6 +74,6 @@ docker run \
|
|||
-v ${PWD}/bin/${ARCH}:/go/bin/linux_${ARCH} \
|
||||
-w /go/src/${PKG} \
|
||||
--env-file .env \
|
||||
ingress-nginx:build ${FLAGS}
|
||||
${E2E_IMAGE} ${FLAGS}
|
||||
|
||||
rm .env
|
||||
|
|
27
images/e2e/Makefile
Normal file
27
images/e2e/Makefile
Normal file
|
@ -0,0 +1,27 @@
|
|||
# Copyright 2018 The Kubernetes Authors. All rights reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
TAG ?=v$(shell date +%m%d%Y)-$(shell git rev-parse --short HEAD)
|
||||
REGISTRY ?= quay.io/kubernetes-ingress-controller
|
||||
DOCKER ?= docker
|
||||
|
||||
IMAGE = $(REGISTRY)/e2e
|
||||
|
||||
all: docker-build docker-push
|
||||
|
||||
docker-build:
|
||||
$(DOCKER) build -t $(IMAGE):$(TAG) .
|
||||
|
||||
docker-push:
|
||||
$(DOCKER) push $(IMAGE):$(TAG)
|
Loading…
Reference in a new issue