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

Fix custom-error-pages image publication script (#2289)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-04-03 15:09:34 -03:00 committed by GitHub
parent 83974c32ac
commit e2937cc8f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
images/custom-error-pages/Makefile
View file

@ -1,4 +1,4 @@
all: push all: all-container
BUILDTAGS= BUILDTAGS=
@ -6,11 +6,11 @@ BUILDTAGS=
TAG?=0.1 TAG?=0.1
REGISTRY?=quay.io/kubernetes-ingress-controller REGISTRY?=quay.io/kubernetes-ingress-controller
GOOS?=linux GOOS?=linux
DOCKER?=gcloud docker -- DOCKER?=docker
SED_I?=sed -i SED_I?=sed -i
GOHOSTOS ?= $(shell go env GOHOSTOS) GOHOSTOS ?= $(shell go env GOHOSTOS)
PKG=k8s.io/ingress/images/custom-error-pages PKG=k8s.io/ingress-nginx/images/custom-error-pages
ifeq ($(GOHOSTOS),darwin) ifeq ($(GOHOSTOS),darwin)
SED_I=sed -i '' SED_I=sed -i ''
@ -52,8 +52,6 @@ TEMP_DIR := $(shell mktemp -d)
DOCKERFILE := $(TEMP_DIR)/rootfs/Dockerfile DOCKERFILE := $(TEMP_DIR)/rootfs/Dockerfile
all: all-container
sub-container-%: sub-container-%:
$(MAKE) ARCH=$* build container $(MAKE) ARCH=$* build container