Skip to content

Commit 932f30e

Browse files
committed
chore(build): only enable cgo for ci/prod builds
1 parent f85c7ba commit 932f30e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ COPY cmd cmd
2121
COPY test test
2222
COPY go.mod go.mod
2323
COPY go.sum go.sum
24-
RUN make build
24+
RUN CGO_ENABLED=1 make build
2525

2626
FROM openshift/origin-base
2727

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,16 @@ build-linux: clean $(CMDS)
7373
build-wait: clean bin/wait
7474

7575
bin/wait:
76-
CGO_ENABLED=1 CGO_DEBUG=1 GOOS=linux GOARCH=386 go build -o $@ $(PKG)/test/e2e/wait
76+
GOOS=linux GOARCH=386 go build -o $@ $(PKG)/test/e2e/wait
7777

7878
$(CMDS): version_flags=-ldflags "-X $(PKG)/pkg/version.GitCommit=$(GIT_COMMIT) -X $(PKG)/pkg/version.OLMVersion=`cat OLM_VERSION`"
7979
$(CMDS):
80-
CGO_ENABLED=1 CGO_DEBUG=1 $(arch_flags) go $(build_cmd) $(MOD_FLAGS) $(version_flags) -o bin/$(shell basename $@) $@
80+
$(arch_flags) go $(build_cmd) $(MOD_FLAGS) $(version_flags) -o bin/$(shell basename $@) $@
81+
82+
build: clean $(CMDS)
8183

8284
$(TCMDS):
83-
CGO_ENABLED=0 go test -c $(BUILD_TAGS) $(MOD_FLAGS) -o bin/$(shell basename $@) $@
85+
go test -c $(BUILD_TAGS) $(MOD_FLAGS) -o bin/$(shell basename $@) $@
8486

8587
run-local: build-linux build-wait
8688
rm -rf build

0 commit comments

Comments
 (0)