upgrade to golang 1.19.2 (#9124)
* upgrade to golang 1.19.2 Signed-off-by: James Strong <strong.james.e@gmail.com> * update e2e testing to 1.25 kind Signed-off-by: James Strong <strong.james.e@gmail.com> Signed-off-by: James Strong <strong.james.e@gmail.com>
This commit is contained in:
parent
ea254fbcb1
commit
93df796767
10 changed files with 31 additions and 52 deletions
10
Makefile
10
Makefile
|
|
@ -53,14 +53,6 @@ ifneq ($(PLATFORM),)
|
|||
PLATFORM_FLAG="--platform"
|
||||
endif
|
||||
|
||||
MAC_OS = $(shell uname -s)
|
||||
|
||||
ifeq ($(MAC_OS), Darwin)
|
||||
MAC_DOCKER_FLAGS="--load"
|
||||
else
|
||||
MAC_DOCKER_FLAGS=
|
||||
endif
|
||||
|
||||
REGISTRY ?= gcr.io/k8s-staging-ingress-nginx
|
||||
|
||||
BASE_IMAGE ?= $(shell cat NGINX_BASE)
|
||||
|
|
@ -76,7 +68,6 @@ image: clean-image ## Build image for a particular arch.
|
|||
docker build \
|
||||
${PLATFORM_FLAG} ${PLATFORM} \
|
||||
--no-cache \
|
||||
$(MAC_DOCKER_FLAGS) \
|
||||
--pull \
|
||||
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
|
||||
--build-arg VERSION="$(TAG)" \
|
||||
|
|
@ -94,7 +85,6 @@ image-chroot: clean-chroot-image ## Build image for a particular arch.
|
|||
echo "Building docker image ($(ARCH))..."
|
||||
docker build \
|
||||
--no-cache \
|
||||
$(MAC_DOCKER_FLAGS) \
|
||||
--pull \
|
||||
--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
|
||||
--build-arg VERSION="$(TAG)" \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue