Skip to content

Commit 3dd08bf

Browse files
committed
remove vcs build and resolve git issues
Signed-off-by: James Strong <[email protected]>
1 parent c2ed9bd commit 3dd08bf

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.4.0
1+
v1.3.1

build/build.sh

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,30 @@ echo "Building targets for ${ARCH}, generated targets in ${TARGETS_DIR} director
4949

5050
echo "Building ${PKG}/cmd/nginx"
5151

52-
pushd /go/src/k8s.io/ingress-nginx
53-
git config --add safe.directory /go/src/k8s.io/ingress-nginx
54-
popd
55-
5652
${GO_BUILD_CMD} \
5753
-trimpath -ldflags="-buildid= -w -s \
58-
-X ${PKG}/version.RELEASE=${TAG} \
59-
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \
60-
-X ${PKG}/version.REPO=${REPO_INFO}" \
54+
-X ${PKG}/version.RELEASE=${TAG} \
55+
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \
56+
-X ${PKG}/version.REPO=${REPO_INFO}" \
57+
-buildvcs=false \
6158
-o "${TARGETS_DIR}/nginx-ingress-controller" "${PKG}/cmd/nginx"
6259

6360
echo "Building ${PKG}/cmd/dbg"
6461

6562
${GO_BUILD_CMD} \
6663
-trimpath -ldflags="-buildid= -w -s \
67-
-X ${PKG}/version.RELEASE=${TAG} \
68-
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \
69-
-X ${PKG}/version.REPO=${REPO_INFO}" \
64+
-X ${PKG}/version.RELEASE=${TAG} \
65+
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \
66+
-X ${PKG}/version.REPO=${REPO_INFO}" \
67+
-buildvcs=false \
7068
-o "${TARGETS_DIR}/dbg" "${PKG}/cmd/dbg"
7169

7270
echo "Building ${PKG}/cmd/waitshutdown"
7371

7472
${GO_BUILD_CMD} \
7573
-trimpath -ldflags="-buildid= -w -s \
76-
-X ${PKG}/version.RELEASE=${TAG} \
77-
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \
78-
-X ${PKG}/version.REPO=${REPO_INFO}" \
74+
-X ${PKG}/version.RELEASE=${TAG} \
75+
-X ${PKG}/version.COMMIT=${COMMIT_SHA} \
76+
-X ${PKG}/version.REPO=${REPO_INFO}" \
77+
-buildvcs=false \
7978
-o "${TARGETS_DIR}/wait-shutdown" "${PKG}/cmd/waitshutdown"

0 commit comments

Comments
 (0)