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

Merge pull request #3011 from aledbf/e2e

Browse source 
Update nginx image
This commit is contained in:
k8s-ci-robot 2018-08-29 07:26:37 -07:00 committed by GitHub
commit 03b67cb436
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -61,7 +61,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.60
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-$(ARCH):0.61
ifeq ($(ARCH),arm)
QEMUARCH=arm

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

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1
fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08292018-7740d78
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v08292018-91eecde
DOCKER_OPTS=${DOCKER_OPTS:-""}

2
images/e2e/Dockerfile
View file

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.59
FROM quay.io/kubernetes-ingress-controller/nginx-amd64:0.61
RUN clean-install \
g++ \