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.

Sign up for GitHub

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

Jump to bottom

Fix custom-error-pages image publication script #2289

Merged
merged 1 commit into from
Apr 3, 2018
Merged

Fix custom-error-pages image publication script #2289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions images/custom-error-pages/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
all: push
all: all-container

BUILDTAGS=

# Use the 0.0 tag for testing, it shouldn't clobber any release builds
TAG?=0.1
REGISTRY?=quay.io/kubernetes-ingress-controller
GOOS?=linux
DOCKER?=gcloud docker --
DOCKER?=docker
SED_I?=sed -i
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)
SED_I=sed -i ''
Expand Down Expand Up @@ -52,8 +52,6 @@ TEMP_DIR := $(shell mktemp -d)

DOCKERFILE := $(TEMP_DIR)/rootfs/Dockerfile

all: all-container

sub-container-%:
$(MAKE) ARCH=$* build container

Expand Down