diff --git a/Makefile b/Makefile index c7fc397a23..ab4bd3c290 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ ARCH ?= amd64 ALL_ARCH := amd64 # Image to use for building. -BUILD_IMAGE ?= golang:1.18-alpine +BUILD_IMAGE ?= golang:1.18 # Containers will be named: $(CONTAINER_PREFIX)-$(BINARY)-$(ARCH):$(VERSION). CONTAINER_PREFIX ?= ingress-gce diff --git a/build/build.sh b/build/build.sh index 63b9e33d08..1445768b27 100755 --- a/build/build.sh +++ b/build/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 2016 The Kubernetes Authors. # diff --git a/build/rules.mk b/build/rules.mk index da5bf5b2f8..d7a90c1159 100644 --- a/build/rules.mk +++ b/build/rules.mk @@ -40,22 +40,6 @@ SRC_DIRS := cmd pkg ALL_ARCH ?= amd64 arm arm64 ppc64le s390x NOBODY ?= nobody -# Set default base image dynamically for each arch -ifeq ($(ARCH),amd64) - BASEIMAGE?=alpine -endif -ifeq ($(ARCH),arm) - BASEIMAGE?=arm32v6/alpine -endif -ifeq ($(ARCH),arm64) - BASEIMAGE?=arm64v8/alpine -endif -ifeq ($(ARCH),ppc64le) - BASEIMAGE?=ppc64le/alpine -endif -ifeq ($(ARCH),s390x) - BASEIMAGE?=s390x/alpine -endif # These rules MUST be expanded at reference time (hence '=') as BINARY # is dynamically scoped. @@ -141,7 +125,6 @@ define DOCKERFILE_RULE -e 's|ARG_ARCH|$(ARCH)|g' \ -e 's|ARG_BIN|$(BINARY)|g' \ -e 's|ARG_REGISTRY|$(REGISTRY)|g' \ - -e 's|ARG_FROM|$(BASEIMAGE)|g' \ -e 's|ARG_NOBODY|$(NOBODY)|g' \ -e 's|ARG_VERSION|$(VERSION)|g' \ $$< > $$@ @@ -154,7 +137,6 @@ $(foreach BINARY,$(CONTAINER_BINARIES),$(eval $(DOCKERFILE_RULE))) define CONTAINER_RULE .$(BUILDSTAMP_NAME)-container: bin/$(ARCH)/$(BINARY) @echo "container: bin/$(ARCH)/$(BINARY) ($(CONTAINER_NAME))" - @docker pull $(BASEIMAGE) @docker build \ $(DOCKER_BUILD_FLAGS) \ -t $(CONTAINER_NAME):$(VERSION) \ diff --git a/build/test.sh b/build/test.sh index 3340fd1402..8c39f2c44d 100755 --- a/build/test.sh +++ b/build/test.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 2016 The Kubernetes Authors. #