diff --git a/.goreleaser.yml b/.goreleaser.yml index 9f438b79..4cc681ba 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,6 +1,5 @@ # Global environment variables for builds. env: - - CGO_ENABLED=0 - GO111MODULE=on - GOPROXY=https://proxy.golang.org|direct - VERSION_PKG=github.com/operator-framework/helm-operator-plugins/internal/version diff --git a/Makefile b/Makefile index 7883501b..83ba02ac 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ test-sanity: generate fix lint ## Test repo formatting, linting, etc. # Build manager binary .PHONY: build build: - CGO_ENABLED=0 mkdir -p $(BUILD_DIR) && go build $(GO_BUILD_ARGS) -o $(BUILD_DIR) ./ + mkdir -p $(BUILD_DIR) && go build $(GO_BUILD_ARGS) -o $(BUILD_DIR) ./ .PHONY: setup-lint setup-lint: ## Setup the lint diff --git a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go index f889d2b9..4516dd36 100644 --- a/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go +++ b/pkg/plugins/hybrid/v1alpha/scaffolds/internal/templates/dockerfile.go @@ -57,7 +57,7 @@ COPY api/ api/ COPY controllers/ controllers/ # Build -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go +RUN GOOS=linux GOARCH=amd64 go build -a -o manager main.go FROM registry.access.redhat.com/ubi8/ubi-micro:8.7 diff --git a/testdata/hybrid/memcached-operator/Dockerfile b/testdata/hybrid/memcached-operator/Dockerfile index 565093ba..173c176b 100644 --- a/testdata/hybrid/memcached-operator/Dockerfile +++ b/testdata/hybrid/memcached-operator/Dockerfile @@ -15,7 +15,7 @@ COPY api/ api/ COPY controllers/ controllers/ # Build -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go +RUN GOOS=linux GOARCH=amd64 go build -a -o manager main.go FROM registry.access.redhat.com/ubi8/ubi-micro:8.7