Skip to content

Commit

Permalink
Merge pull request #551 from mjura/cgo-main
Browse files Browse the repository at this point in the history
Disable C calls from GO in operator
  • Loading branch information
mjura committed May 23, 2024
2 parents 7836ac8 + ded27d8 commit 8b3568e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN zypper -n update && \
zypper -n install bash git binutils glibc-devel-static gcc vim less file tar gzip curl sed wget ca-certificates

ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
GOPATH=/go CGO_ENABLED=0 PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash
RUN curl -sLf https://storage.googleapis.com/golang/go1.21.10.linux-${ARCH}.tar.gz | tar -xzf - -C /usr/local/
# workaround for https://bugzilla.suse.com/show_bug.cgi?id=1183043
RUN if [ "${ARCH}" == "arm64" ]; then \
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ $(SETUP_ENVTEST):

.PHONY: operator
operator:
go build -o bin/eks-operator main.go
CGO_ENABLED=0 go build -o bin/eks-operator main.go

.PHONY: generate-go
generate-go: $(MOCKGEN)
Expand Down Expand Up @@ -187,4 +187,4 @@ APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)

.PHONY: apidiff
apidiff: $(GO_APIDIFF) ## Check for API differences
$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible
$(GO_APIDIFF) $(APIDIFF_OLD_COMMIT) --print-compatible

0 comments on commit 8b3568e

Please sign in to comment.