Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Containerd v1.2.5 #3306

Merged
merged 3 commits into from Mar 15, 2019

Conversation

Projects
None yet
3 participants
@ijc
Copy link
Collaborator

ijc commented Mar 14, 2019

Containerd release: https://github.com/containerd/containerd/releases/tag/v1.2.5

This omits the usual implied runc bump (opencontainers/runc@6635b4f...2b18fe1 in this case) because recent changes have introduced the use of secure_getenv which is a glibc extension and so not available with musl:

#10 1.022 CGO_ENABLED=1 go build -buildmode pie -tags "seccomp netgo osusergo static_build" -installsuffix netgo -ldflags "-w -extldflags -static -X main.gitCommit="2b18fe1d885ee5083ef9f0838fee39b62d653e30" -X main.version=1.0.0-rc6+dev -extldflags \"-fno-PIC -static\"" -o runc .
#10 8.372 # github.com/opencontainers/runc/libcontainer/nsenter
#10 8.372 /usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: $WORK/b119/_x003.o: in function `try_bindfd':
#10 8.372 libcontainer/nsenter/cloned_binary.c:354: undefined reference to `secure_getenv'
#10 8.372 /usr/lib/gcc/x86_64-alpine-linux-musl/8.2.0/../../../../x86_64-alpine-linux-musl/bin/ld: $WORK/b119/_x003.o: in function `make_execfd':
#10 8.372 libcontainer/nsenter/cloned_binary.c:252: undefined reference to `secure_getenv'
#10 8.372 collect2: error: ld returned 1 exit status
#10 8.372 # github.com/opencontainers/runc/libcontainer/nsenter
#10 8.372 cloned_binary.c: In function 'make_execfd':
#10 8.372 cloned_binary.c:252:17: warning: implicit declaration of function 'secure_getenv' [-Wimplicit-function-declaration]
#10 8.372   char *prefix = secure_getenv("_LIBCONTAINER_STATEDIR");
#10 8.372                  ^~~~~~~~~~~~~
#10 8.372 cloned_binary.c:252:17: warning: initialization of 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
#10 8.372 cloned_binary.c: In function 'try_bindfd':
#10 8.372 cloned_binary.c:354:17: warning: initialization of 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
#10 8.372   char *prefix = secure_getenv("_LIBCONTAINER_STATEDIR");
#10 8.372                  ^~~~~~~~~~~~~
#10 14.44 make: *** [Makefile:43: static] Error 2
------
executor failed running [/bin/sh -c make static BUILDTAGS="seccomp" EXTRA_FLAGS="-buildmode pie" EXTRA_LDFLAGS="-extldflags \\\"-fno-PIC -static\\\""]: exit code: 2

@justincormack already raised a PR on runc for that opencontainers/runc#2015, in the meantime there appears to be nothing too critical in the bump and it seems safer to stick with the existing, known good, version than to pick a commit just before the change.

ijc added some commits Mar 13, 2019

alpine: Bump to containerd v1.2.5
Signed-off-by: Ian Campbell <ijc@docker.com>
Bump packages to new alpine w/ containerd v1.2.5
Signed-off-by: Ian Campbell <ijc@docker.com>
Bump yml to pickup containerd v1.2.5
Signed-off-by: Ian Campbell <ijc@docker.com>

@justincormack justincormack merged commit 9504b93 into linuxkit:master Mar 15, 2019

3 checks passed

ci/circleci Your tests passed on CircleCI!
Details
ci/datakit/linuxkit-ci All tests passed
Details
dco-signed All commits are signed

@ijc ijc deleted the ijc:containerd-v1.2.5 branch Mar 15, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.