Skip to content

Commit 9c754d5

Browse files
authored
Merge pull request #820 from andre-j3sus/fix/static-link-docker-credential-mmds
#819: fix: enable static linking for docker-credential-mmds to resolve glib
2 parents ced7306 + c47417b commit 9c754d5

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ INTEG_TEST_SUBDIRS:=$(addprefix integ-test-,$(SUBDIRS))
1717

1818
export INSTALLROOT?=/usr/local
1919
export STATIC_AGENT
20+
export STATIC_DOCKER_CREDENTIAL_MMDS
2021

2122
export DOCKER_IMAGE_TAG?=latest
2223

@@ -89,6 +90,7 @@ $(SUBDIRS):
8990
--env GOPATH=/go \
9091
--env GO111MODULES=on \
9192
--env STATIC_AGENT=on \
93+
--env STATIC_DOCKER_CREDENTIAL_MMDS=on \
9294
--env GOPROXY=$(shell go env GOPROXY) \
9395
--workdir /src \
9496
$(FIRECRACKER_CONTAINERD_BUILDER_IMAGE) \

docker-credential-mmds/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ all: credential-helper
2222
credential-helper: docker-credential-mmds
2323

2424
docker-credential-mmds: $(SOURCES) $(GOMOD) $(GOSUM)
25+
ifneq ($(STATIC_DOCKER_CREDENTIAL_MMDS),)
26+
CGO_ENABLED=0 go build -o docker-credential-mmds $(EXTRAGOARGS) -ldflags "-X main.revision=$(REVISION)"
27+
else
2528
go build -o docker-credential-mmds $(EXTRAGOARGS) -ldflags "-X main.revision=$(REVISION)"
29+
endif
2630

2731
test:
2832
go test ./... $(EXTRAGOARGS)

0 commit comments

Comments
 (0)