Merge pull request #7188 from dokku/libc-fix

Respect GO environment variables when building to ensure CGO is disabled
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2024-09-23 03:30:12 -04:00
commit 6e36390826
4 files changed
+7 -4

No files matched your search

+2 -2
View File
@@ -54,7 +54,7 @@ go-build:
basedir=$(PWD); \ basedir=$(PWD); \
for dir in plugins/*; do \ for dir in plugins/*; do \
if [ -e $$dir/Makefile ]; then \ if [ -e $$dir/Makefile ]; then \
$(MAKE) -e -C $$dir $(PLUGIN_MAKE_TARGET) || exit $$? ;\ GO_ARGS='$(GO_ARGS)' CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) GOWORK=off $(MAKE) -e -C $$dir $(PLUGIN_MAKE_TARGET) || exit $$? ;\
fi ;\ fi ;\
done done
@@ -64,7 +64,7 @@ ifndef PLUGIN_NAME
$(error PLUGIN_NAME not specified) $(error PLUGIN_NAME not specified)
endif endif
if [ -e plugins/$(PLUGIN_NAME)/Makefile ]; then \ if [ -e plugins/$(PLUGIN_NAME)/Makefile ]; then \
$(MAKE) -e -C plugins/$(PLUGIN_NAME) $(PLUGIN_MAKE_TARGET) || exit $$? ;\ GO_ARGS='$(GO_ARGS)' CGO_ENABLED=0 GOOS=linux GOARCH=$(GOARCH) GOWORK=off $(MAKE) -e -C plugins/$(PLUGIN_NAME) $(PLUGIN_MAKE_TARGET) || exit $$? ;\
fi fi
go-clean: go-clean:
+1 -1
View File
@@ -1,4 +1,4 @@
go 1.23 go 1.23.0
use ( use (
./plugins/app-json ./plugins/app-json
+3
View File
@@ -3,4 +3,7 @@ TRIGGERS = triggers/app-json-process-deploy-parallelism triggers/app-json-get-co
BUILD = commands subcommands triggers BUILD = commands subcommands triggers
PLUGIN_NAME = app-json PLUGIN_NAME = app-json
goenv:
go env
include ../../common.mk include ../../common.mk
+1 -1
View File
@@ -1,6 +1,6 @@
module github.com/dokku/dokku/plugins/scheduler-k3s module github.com/dokku/dokku/plugins/scheduler-k3s
go 1.23 go 1.23.0
require ( require (
github.com/cert-manager/cert-manager v1.13.3 github.com/cert-manager/cert-manager v1.13.3