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

added fixes for make dev-env (#8804)

Browse source
This commit is contained in:
Long Wu Yuan 2022-07-21 06:27:44 +05:30 committed by GitHub
parent 4c6a7ee158
commit 0cc43d5e52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -54,8 +54,9 @@ ifneq ($(PLATFORM),)
endif endif
MAC_OS = $(shell uname -s) MAC_OS = $(shell uname -s)
ifeq ($(MAC_OS), Darwin) ifeq ($(MAC_OS), Darwin)
MAC_DOCKER_FLAGS="--load" MAC_DOCKER_FLAGS=
else else
MAC_DOCKER_FLAGS= MAC_DOCKER_FLAGS=
endif endif

1
build/build.sh
View file

@ -49,6 +49,7 @@ echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} director
echo "Building ${PKG}/cmd/nginx" echo "Building ${PKG}/cmd/nginx"
git config --add safe.directory /go/src/k8s.io/ingress-nginx
${GO_BUILD_CMD} \ ${GO_BUILD_CMD} \
-trimpath -ldflags="-buildid= -w -s \ -trimpath -ldflags="-buildid= -w -s \
-X ${PKG}/version.RELEASE=${TAG} \ -X ${PKG}/version.RELEASE=${TAG} \

2
build/run-in-docker.sh
View file

@ -65,12 +65,14 @@ fi
USER=${USER:-nobody} USER=${USER:-nobody}
MAC_OS="`uname -s`"
MAC_OS="${MAC_OS:-}" MAC_OS="${MAC_OS:-}"
if [[ ${MAC_OS} == "Darwin" ]]; then if [[ ${MAC_OS} == "Darwin" ]]; then
MAC_DOCKER_FLAGS="" MAC_DOCKER_FLAGS=""
else else
MAC_DOCKER_FLAGS="-u $(id -u ${USER}):$(id -g ${USER})" #idk why mac/git fails on the gobuild if these are presented to dockerrun.sh script MAC_DOCKER_FLAGS="-u $(id -u ${USER}):$(id -g ${USER})" #idk why mac/git fails on the gobuild if these are presented to dockerrun.sh script
fi fi
echo "MAC_OS = ${MAC_OS}, MAC_OS_FLAGS = ${MAC_DOCKER_FLAGS}"
echo "..printing env & other vars to stdout" echo "..printing env & other vars to stdout"
echo "HOSTNAME=`hostname`" echo "HOSTNAME=`hostname`"