Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use an existing e2e image #2868

Merged
merged 1 commit into from
Jul 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/go-in-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=$@

Expand Down Expand Up @@ -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
File renamed without changes.
27 changes: 27 additions & 0 deletions images/e2e/Makefile
Original file line number Diff line number Diff line change
@@ -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)