Use go version directly from Makefile
This commit is contained in:
parent
94e9ac3c30
commit
4d21a1d63a
3 changed files with 10 additions and 24 deletions
2
Makefile
2
Makefile
|
@ -105,7 +105,7 @@ clean-chroot-image: ## Removes local image
|
||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
||||||
build: ## Build ingress controller, debug tool and pre-stop hook.
|
build: ## Build ingress controller, debug tool and pre-stop hook.
|
||||||
build/run-in-docker.sh \
|
E2E_IMAGE=golang:1.21.6-alpine3.19 USE_SHELL=/bin/sh build/run-in-docker.sh \
|
||||||
MAC_OS=$(MAC_OS) \
|
MAC_OS=$(MAC_OS) \
|
||||||
PKG=$(PKG) \
|
PKG=$(PKG) \
|
||||||
ARCH=$(ARCH) \
|
ARCH=$(ARCH) \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
|
|
||||||
# Copyright 2018 The Kubernetes Authors.
|
# Copyright 2018 The Kubernetes Authors.
|
||||||
#
|
#
|
||||||
|
@ -25,24 +25,15 @@ set -o errexit
|
||||||
set -o nounset
|
set -o nounset
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
declare -a mandatory
|
|
||||||
mandatory=(
|
|
||||||
PKG
|
|
||||||
ARCH
|
|
||||||
COMMIT_SHA
|
|
||||||
REPO_INFO
|
|
||||||
TAG
|
|
||||||
)
|
|
||||||
|
|
||||||
for var in "${mandatory[@]}"; do
|
if [ -z "$PKG" ] || [ -z "$ARCH" ] || [ -z "$COMMIT_SHA" ] || [ -z "$REPO_INFO" ] || [ -z "$TAG" ]; then
|
||||||
if [[ -z "${!var:-}" ]]; then
|
echo "Environments PKG, ARCH, COMMIT_SHA, REPO_INFO and TAG are required"
|
||||||
echo "Environment variable $var must be set"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
done
|
|
||||||
|
|
||||||
export CGO_ENABLED=0
|
export CGO_ENABLED=0
|
||||||
export GOARCH=${ARCH}
|
export GOARCH="${ARCH}"
|
||||||
|
|
||||||
TARGETS_DIR="rootfs/bin/${ARCH}"
|
TARGETS_DIR="rootfs/bin/${ARCH}"
|
||||||
echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} directory."
|
echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} directory."
|
||||||
|
|
|
@ -76,12 +76,7 @@ fi
|
||||||
|
|
||||||
USER=${USER:-nobody}
|
USER=${USER:-nobody}
|
||||||
|
|
||||||
#echo "..printing env & other vars to stdout"
|
USE_SHELL=${USE_SHELL:-"/bin/bash"}
|
||||||
#echo "HOSTNAME=`hostname`"
|
|
||||||
#uname -a
|
|
||||||
#env
|
|
||||||
#echo "DIND_ENABLED=$DOCKER_IN_DOCKER_ENABLED"
|
|
||||||
#echo "done..printing env & other vars to stdout"
|
|
||||||
|
|
||||||
if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
|
if [[ "$DOCKER_IN_DOCKER_ENABLED" == "true" ]]; then
|
||||||
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
|
echo "..reached DIND check TRUE block, inside run-in-docker.sh"
|
||||||
|
@ -100,5 +95,5 @@ else
|
||||||
args="$args -v /var/run/docker.sock:/var/run/docker.sock"
|
args="$args -v /var/run/docker.sock:/var/run/docker.sock"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${RUNTIME} run $args ${E2E_IMAGE} /bin/bash -c "${FLAGS}"
|
${RUNTIME} run $args ${E2E_IMAGE} ${USE_SHELL} -c "${FLAGS}"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue