* [Buildroot] [PATCH 1/7] package/runc: bump to version 1.0.0-rc7
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 2/7] Revert "package/runc: blacklist Codesourcery ARM toolchain" Peter Korsgaard
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
This includes an improved fix for CVE-2019-5736 without the ~10MB memory
overhead per container and with fallback code using mkostemp(3) when
O_TMPFILE isn't available.
For more details, see the announcement:
https://github.com/opencontainers/runc/releases/tag/v1.0.0-rc7
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
...ne-proc-self-exe-to-avoid-exposing-host-b.patch | 338 ---------------------
package/runc/runc.hash | 2 +-
package/runc/runc.mk | 2 +-
3 files changed, 2 insertions(+), 340 deletions(-)
delete mode 100644 package/runc/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch
diff --git a/package/runc/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch b/package/runc/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch
deleted file mode 100644
index a0bc7ba300..0000000000
--- a/package/runc/0001-nsenter-clone-proc-self-exe-to-avoid-exposing-host-b.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001
-From: Aleksa Sarai <asarai@suse.de>
-Date: Wed, 9 Jan 2019 13:40:01 +1100
-Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary
- to container
-
-There are quite a few circumstances where /proc/self/exe pointing to a
-pretty important container binary is a _bad_ thing, so to avoid this we
-have to make a copy (preferably doing self-clean-up and not being
-writeable).
-
-We require memfd_create(2) -- though there is an O_TMPFILE fallback --
-but we can always extend this to use a scratch MNT_DETACH overlayfs or
-tmpfs. The main downside to this approach is no page-cache sharing for
-the runc binary (which overlayfs would give us) but this is far less
-complicated.
-
-This is only done during nsenter so that it happens transparently to the
-Go code, and any libcontainer users benefit from it. This also makes
-ExtraFiles and --preserve-fds handling trivial (because we don't need to
-worry about it).
-
-Fixes: CVE-2019-5736
-Co-developed-by: Christian Brauner <christian.brauner@ubuntu.com>
-Signed-off-by: Aleksa Sarai <asarai@suse.de>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++++++++++
- libcontainer/nsenter/nsexec.c | 11 ++
- 2 files changed, 279 insertions(+)
- create mode 100644 libcontainer/nsenter/cloned_binary.c
-
-diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c
-new file mode 100644
-index 00000000..c8a42c23
---- /dev/null
-+++ b/libcontainer/nsenter/cloned_binary.c
-@@ -0,0 +1,268 @@
-+/*
-+ * Copyright (C) 2019 Aleksa Sarai <cyphar@cyphar.com>
-+ * Copyright (C) 2019 SUSE LLC
-+ *
-+ * Licensed under the Apache License, Version 2.0 (the "License");
-+ * you may not use this file except in compliance with the License.
-+ * You may obtain a copy of the License at
-+ *
-+ * http://www.apache.org/licenses/LICENSE-2.0
-+ *
-+ * Unless required by applicable law or agreed to in writing, software
-+ * distributed under the License is distributed on an "AS IS" BASIS,
-+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+ * See the License for the specific language governing permissions and
-+ * limitations under the License.
-+ */
-+
-+#define _GNU_SOURCE
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <string.h>
-+#include <limits.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/vfs.h>
-+#include <sys/mman.h>
-+#include <sys/sendfile.h>
-+#include <sys/syscall.h>
-+
-+/* Use our own wrapper for memfd_create. */
-+#if !defined(SYS_memfd_create) && defined(__NR_memfd_create)
-+# define SYS_memfd_create __NR_memfd_create
-+#endif
-+#ifdef SYS_memfd_create
-+# define HAVE_MEMFD_CREATE
-+/* memfd_create(2) flags -- copied from <linux/memfd.h>. */
-+# ifndef MFD_CLOEXEC
-+# define MFD_CLOEXEC 0x0001U
-+# define MFD_ALLOW_SEALING 0x0002U
-+# endif
-+int memfd_create(const char *name, unsigned int flags)
-+{
-+ return syscall(SYS_memfd_create, name, flags);
-+}
-+#endif
-+
-+/* This comes directly from <linux/fcntl.h>. */
-+#ifndef F_LINUX_SPECIFIC_BASE
-+# define F_LINUX_SPECIFIC_BASE 1024
-+#endif
-+#ifndef F_ADD_SEALS
-+# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9)
-+# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10)
-+#endif
-+#ifndef F_SEAL_SEAL
-+# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */
-+# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
-+# define F_SEAL_GROW 0x0004 /* prevent file from growing */
-+# define F_SEAL_WRITE 0x0008 /* prevent writes */
-+#endif
-+
-+#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */
-+#ifdef HAVE_MEMFD_CREATE
-+# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe"
-+# define RUNC_MEMFD_SEALS \
-+ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)
-+#endif
-+
-+static void *must_realloc(void *ptr, size_t size)
-+{
-+ void *old = ptr;
-+ do {
-+ ptr = realloc(old, size);
-+ } while(!ptr);
-+ return ptr;
-+}
-+
-+/*
-+ * Verify whether we are currently in a self-cloned program (namely, is
-+ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather
-+ * for shmem files), and we want to be sure it's actually sealed.
-+ */
-+static int is_self_cloned(void)
-+{
-+ int fd, ret, is_cloned = 0;
-+
-+ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC);
-+ if (fd < 0)
-+ return -ENOTRECOVERABLE;
-+
-+#ifdef HAVE_MEMFD_CREATE
-+ ret = fcntl(fd, F_GET_SEALS);
-+ is_cloned = (ret == RUNC_MEMFD_SEALS);
-+#else
-+ struct stat statbuf = {0};
-+ ret = fstat(fd, &statbuf);
-+ if (ret >= 0)
-+ is_cloned = (statbuf.st_nlink == 0);
-+#endif
-+ close(fd);
-+ return is_cloned;
-+}
-+
-+/*
-+ * Basic wrapper around mmap(2) that gives you the file length so you can
-+ * safely treat it as an ordinary buffer. Only gives you read access.
-+ */
-+static char *read_file(char *path, size_t *length)
-+{
-+ int fd;
-+ char buf[4096], *copy = NULL;
-+
-+ if (!length)
-+ return NULL;
-+
-+ fd = open(path, O_RDONLY | O_CLOEXEC);
-+ if (fd < 0)
-+ return NULL;
-+
-+ *length = 0;
-+ for (;;) {
-+ int n;
-+
-+ n = read(fd, buf, sizeof(buf));
-+ if (n < 0)
-+ goto error;
-+ if (!n)
-+ break;
-+
-+ copy = must_realloc(copy, (*length + n) * sizeof(*copy));
-+ memcpy(copy + *length, buf, n);
-+ *length += n;
-+ }
-+ close(fd);
-+ return copy;
-+
-+error:
-+ close(fd);
-+ free(copy);
-+ return NULL;
-+}
-+
-+/*
-+ * A poor-man's version of "xargs -0". Basically parses a given block of
-+ * NUL-delimited data, within the given length and adds a pointer to each entry
-+ * to the array of pointers.
-+ */
-+static int parse_xargs(char *data, int data_length, char ***output)
-+{
-+ int num = 0;
-+ char *cur = data;
-+
-+ if (!data || *output != NULL)
-+ return -1;
-+
-+ while (cur < data + data_length) {
-+ num++;
-+ *output = must_realloc(*output, (num + 1) * sizeof(**output));
-+ (*output)[num - 1] = cur;
-+ cur += strlen(cur) + 1;
-+ }
-+ (*output)[num] = NULL;
-+ return num;
-+}
-+
-+/*
-+ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ.
-+ * This is necessary because we are running in a context where we don't have a
-+ * main() that we can just get the arguments from.
-+ */
-+static int fetchve(char ***argv, char ***envp)
-+{
-+ char *cmdline = NULL, *environ = NULL;
-+ size_t cmdline_size, environ_size;
-+
-+ cmdline = read_file("/proc/self/cmdline", &cmdline_size);
-+ if (!cmdline)
-+ goto error;
-+ environ = read_file("/proc/self/environ", &environ_size);
-+ if (!environ)
-+ goto error;
-+
-+ if (parse_xargs(cmdline, cmdline_size, argv) <= 0)
-+ goto error;
-+ if (parse_xargs(environ, environ_size, envp) <= 0)
-+ goto error;
-+
-+ return 0;
-+
-+error:
-+ free(environ);
-+ free(cmdline);
-+ return -EINVAL;
-+}
-+
-+static int clone_binary(void)
-+{
-+ int binfd, memfd;
-+ ssize_t sent = 0;
-+
-+#ifdef HAVE_MEMFD_CREATE
-+ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING);
-+#else
-+ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711);
-+#endif
-+ if (memfd < 0)
-+ return -ENOTRECOVERABLE;
-+
-+ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC);
-+ if (binfd < 0)
-+ goto error;
-+
-+ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX);
-+ close(binfd);
-+ if (sent < 0)
-+ goto error;
-+
-+#ifdef HAVE_MEMFD_CREATE
-+ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS);
-+ if (err < 0)
-+ goto error;
-+#else
-+ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */
-+ int newfd;
-+ char *fdpath = NULL;
-+
-+ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0)
-+ goto error;
-+ newfd = open(fdpath, O_RDONLY | O_CLOEXEC);
-+ free(fdpath);
-+ if (newfd < 0)
-+ goto error;
-+
-+ close(memfd);
-+ memfd = newfd;
-+#endif
-+ return memfd;
-+
-+error:
-+ close(memfd);
-+ return -EIO;
-+}
-+
-+int ensure_cloned_binary(void)
-+{
-+ int execfd;
-+ char **argv = NULL, **envp = NULL;
-+
-+ /* Check that we're not self-cloned, and if we are then bail. */
-+ int cloned = is_self_cloned();
-+ if (cloned > 0 || cloned == -ENOTRECOVERABLE)
-+ return cloned;
-+
-+ if (fetchve(&argv, &envp) < 0)
-+ return -EINVAL;
-+
-+ execfd = clone_binary();
-+ if (execfd < 0)
-+ return -EIO;
-+
-+ fexecve(execfd, argv, envp);
-+ return -ENOEXEC;
-+}
-diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c
-index 28269dfc..7750af35 100644
---- a/libcontainer/nsenter/nsexec.c
-+++ b/libcontainer/nsenter/nsexec.c
-@@ -534,6 +534,9 @@ void join_namespaces(char *nslist)
- free(namespaces);
- }
-
-+/* Defined in cloned_binary.c. */
-+extern int ensure_cloned_binary(void);
-+
- void nsexec(void)
- {
- int pipenum;
-@@ -549,6 +552,14 @@ void nsexec(void)
- if (pipenum == -1)
- return;
-
-+ /*
-+ * We need to re-exec if we are not in a cloned binary. This is necessary
-+ * to ensure that containers won't be able to access the host binary
-+ * through /proc/self/exe. See CVE-2019-5736.
-+ */
-+ if (ensure_cloned_binary() < 0)
-+ bail("could not ensure we are a cloned binary");
-+
- /* Parse all of the netlink configuration. */
- nl_parse(pipenum, &config);
-
---
-2.11.0
-
diff --git a/package/runc/runc.hash b/package/runc/runc.hash
index 1636e5b8e9..24c30f5726 100644
--- a/package/runc/runc.hash
+++ b/package/runc/runc.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 a221f8380e7b5806031f54d423af6dde24c305dad49868056cf70e5f5f4ef771 runc-v1.0.0-rc6.tar.gz
+sha256 e8388b812d93a8a131a2a2fdd851847295c8e341721002940dadd2999fb81b51 runc-v1.0.0-rc7.tar.gz
sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index 0539661266..56463b468e 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -4,7 +4,7 @@
#
################################################################################
-RUNC_VERSION = v1.0.0-rc6
+RUNC_VERSION = v1.0.0-rc7
RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
RUNC_LICENSE = Apache-2.0
RUNC_LICENSE_FILES = LICENSE
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 2/7] Revert "package/runc: blacklist Codesourcery ARM toolchain"
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 1/7] package/runc: bump to version 1.0.0-rc7 Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 3/7] Revert "runc: depend on linux headers >= 3.11 for O_TMPFILE" Peter Korsgaard
` (6 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
This reverts commit ce76a989022baa6395b874ed44b9246bba053f8a.
With the bump to 1.0.0-rc7, runc no longer needs O_TMPFILE.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-containerd/Config.in | 2 --
package/docker-engine/Config.in | 2 --
package/runc/Config.in | 2 --
3 files changed, 6 deletions(-)
diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
index ffa2b208f2..8d80d8623b 100644
--- a/package/docker-containerd/Config.in
+++ b/package/docker-containerd/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # runc
depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # runc
depends on BR2_USE_MMU # util-linux
select BR2_PACKAGE_RUNC # runtime dependency
select BR2_PACKAGE_UTIL_LINUX # runtime dependency
@@ -36,4 +35,3 @@ comment "docker-containerd needs a glibc or musl toolchain w/ threads"
depends on BR2_USE_MMU
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index bc36b05bed..8364759ae1 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_DOCKER_ENGINE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # docker-containerd -> runc
depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # docker-containerd -> runc
depends on BR2_USE_MMU # docker-containerd
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
@@ -57,5 +56,4 @@ comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
depends on BR2_USE_MMU
diff --git a/package/runc/Config.in b/package/runc/Config.in
index 8939193048..2f32bce207 100644
--- a/package/runc/Config.in
+++ b/package/runc/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_RUNC
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # O_TMPFILE
depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.19
help
runC is a CLI tool for spawning and running containers
according to the OCP specification.
@@ -17,4 +16,3 @@ comment "runc needs a glibc or musl toolchain w/ threads, headers >= 3.11"
BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAN_USES_UCLIBC
- depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 3/7] Revert "runc: depend on linux headers >= 3.11 for O_TMPFILE"
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 1/7] package/runc: bump to version 1.0.0-rc7 Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 2/7] Revert "package/runc: blacklist Codesourcery ARM toolchain" Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 4/7] package/docker-containerd: bump version to v1.2.5 Peter Korsgaard
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
This reverts commit 905e976a6af224b3ed015c46fcea2d717c155f55.
With the bump to 1.0.0-rc7, runc no longer needs O_TMPFILE.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-containerd/Config.in | 4 +---
package/docker-engine/Config.in | 6 ++----
package/runc/Config.in | 6 ++----
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
index 8d80d8623b..35867df21a 100644
--- a/package/docker-containerd/Config.in
+++ b/package/docker-containerd/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # runc
depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
depends on BR2_USE_MMU # util-linux
select BR2_PACKAGE_RUNC # runtime dependency
@@ -33,5 +32,4 @@ comment "docker-containerd needs a glibc or musl toolchain w/ threads"
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_USE_MMU
- depends on !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in
index 8364759ae1..1fd229fcbb 100644
--- a/package/docker-engine/Config.in
+++ b/package/docker-engine/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_DOCKER_ENGINE
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # docker-containerd -> runc
depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
depends on BR2_USE_MMU # docker-containerd
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
@@ -51,9 +50,8 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS
endif
-comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.11"
+comment "docker-engine needs a glibc or musl toolchain w/ threads"
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
- depends on !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_USE_MMU
diff --git a/package/runc/Config.in b/package/runc/Config.in
index 2f32bce207..f181ee334f 100644
--- a/package/runc/Config.in
+++ b/package/runc/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_RUNC
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
depends on BR2_TOOLCHAIN_HAS_THREADS
- depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # O_TMPFILE
depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
help
runC is a CLI tool for spawning and running containers
@@ -11,8 +10,7 @@ config BR2_PACKAGE_RUNC
https://github.com/opencontainers/runc
-comment "runc needs a glibc or musl toolchain w/ threads, headers >= 3.11"
+comment "runc needs a glibc or musl toolchain w/ threads"
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \
BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
- depends on !BR2_TOOLCHAIN_HAS_THREADS || \
- !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAN_USES_UCLIBC
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAN_USES_UCLIBC
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 4/7] package/docker-containerd: bump version to v1.2.5
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
` (2 preceding siblings ...)
2019-04-01 18:23 ` [Buildroot] [PATCH 3/7] Revert "runc: depend on linux headers >= 3.11 for O_TMPFILE" Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 5/7] package/docker-containerd: refer to official website Peter Korsgaard
` (4 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
Contains a number of bugfixes. For more details, see the announcement:
https://github.com/containerd/containerd/releases/tag/v1.2.5
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-containerd/docker-containerd.hash | 2 +-
package/docker-containerd/docker-containerd.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index cae88f40e2..fc7b6fcb49 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,3 +1,3 @@
# Computed locally
-sha256 ff4c2ad680c9e2484e335868a54b0c1ea49d9165dd5b38b64ef7d9dacf2b96b4 docker-containerd-v1.2.3.tar.gz
+sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 docker-containerd-v1.2.5.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 9088c17660..586fd1fa08 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = v1.2.3
+DOCKER_CONTAINERD_VERSION = v1.2.5
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 5/7] package/docker-containerd: refer to official website
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
` (3 preceding siblings ...)
2019-04-01 18:23 ` [Buildroot] [PATCH 4/7] package/docker-containerd: bump version to v1.2.5 Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 6/7] package/docker-engine: bump to version v18.09.4 Peter Korsgaard
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
Containerd is no longer maintained under the docker github project and now
has an official website, so refer to that in the help text.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-containerd/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in
index 35867df21a..9568dd0a2a 100644
--- a/package/docker-containerd/Config.in
+++ b/package/docker-containerd/Config.in
@@ -14,7 +14,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
help
containerd is a daemon to control runC.
- https://github.com/docker/containerd
+ https://containerd.io/
if BR2_PACKAGE_DOCKER_CONTAINERD
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 6/7] package/docker-engine: bump to version v18.09.4
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
` (4 preceding siblings ...)
2019-04-01 18:23 ` [Buildroot] [PATCH 5/7] package/docker-containerd: refer to official website Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
2019-04-01 18:23 ` [Buildroot] [PATCH 7/7] package/docker-cli: " Peter Korsgaard
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-engine/docker-engine.hash | 2 +-
package/docker-engine/docker-engine.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash
index fe7b0d3b94..b268b7f330 100644
--- a/package/docker-engine/docker-engine.hash
+++ b/package/docker-engine/docker-engine.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 4babbcbc3e1d7750c61a1e5bee29bd206256948961feaac5b44cabb0c70a50a6 docker-engine-v18.09.2.tar.gz
+sha256 1f4bd15d799420b587024fe3c6d7bd4eb584e509d30c8193db31411579780f2a docker-engine-v18.09.4.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index e2f59666df..92e364e60d 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_ENGINE_VERSION = v18.09.2
+DOCKER_ENGINE_VERSION = v18.09.4
DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 7/7] package/docker-cli: bump to version v18.09.4
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
` (5 preceding siblings ...)
2019-04-01 18:23 ` [Buildroot] [PATCH 6/7] package/docker-engine: bump to version v18.09.4 Peter Korsgaard
@ 2019-04-01 18:23 ` Peter Korsgaard
[not found] ` <87mul8vgj8.fsf@paral.in>
2019-04-14 21:15 ` Peter Korsgaard
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-01 18:23 UTC (permalink / raw)
To: buildroot
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/docker-cli/docker-cli.hash | 2 +-
package/docker-cli/docker-cli.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash
index 9782f34baa..41686f0de8 100644
--- a/package/docker-cli/docker-cli.hash
+++ b/package/docker-cli/docker-cli.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 29f3a435bfcd52dbe26f6315ee92bffc0220a537608935a2c3870f6b729fc16e docker-cli-v18.09.2.tar.gz
+sha256 f9be44f395617f3f75faac69ad90f93c94ee4050c193bfa05eddb520a27c5d44 docker-cli-v18.09.4.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk
index c3dd536937..65701d1530 100644
--- a/package/docker-cli/docker-cli.mk
+++ b/package/docker-cli/docker-cli.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_CLI_VERSION = v18.09.2
+DOCKER_CLI_VERSION = v18.09.4
DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION))
DOCKER_CLI_WORKSPACE = gopath
--
2.11.0
^ permalink raw reply related [flat|nested] 15+ messages in thread[parent not found: <87mul8vgj8.fsf@paral.in>]
* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
[not found] ` <87mul8vgj8.fsf@paral.in>
@ 2019-04-02 15:24 ` Peter Korsgaard
2019-04-07 7:20 ` Peter Korsgaard
1 sibling, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-02 15:24 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <kidovate@gmail.com> writes:
Hi,
> I'll test this series this week on:
> - Odroid XU4, HC1/HC2
> - Pi 0, 3, 3B
> - x86
> - Bananapi M1, etc
Great, thanks. I have so far only done minimal tests on x86.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
[not found] ` <87mul8vgj8.fsf@paral.in>
2019-04-02 15:24 ` [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
@ 2019-04-07 7:20 ` Peter Korsgaard
2019-04-07 8:56 ` Christian Stewart
1 sibling, 1 reply; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-07 7:20 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <kidovate@gmail.com> writes:
Hi,
> I'll test this series this week on:
> - Odroid XU4, HC1/HC2
> - Pi 0, 3, 3B
> - x86
> - Bananapi M1, etc
Any update on this? Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
2019-04-07 7:20 ` Peter Korsgaard
@ 2019-04-07 8:56 ` Christian Stewart
2019-04-07 9:28 ` Peter Korsgaard
0 siblings, 1 reply; 15+ messages in thread
From: Christian Stewart @ 2019-04-07 8:56 UTC (permalink / raw)
To: buildroot
Hi Peter,
On Sun, Apr 7, 2019, 12:20 AM Peter Korsgaard <peter@korsgaard.com> wrote:
> Any update on this? Thanks.
>
I ran into some unrelated issues and was delayed a bit on this. I'm
compiling the images now and will try to get the testing done within 24
hours.
Best,
Christian
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20190407/d1065b54/attachment.html>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
2019-04-07 8:56 ` Christian Stewart
@ 2019-04-07 9:28 ` Peter Korsgaard
2019-04-08 4:35 ` Christian Stewart
0 siblings, 1 reply; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-07 9:28 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Hi Peter,
> On Sun, Apr 7, 2019, 12:20 AM Peter Korsgaard <peter@korsgaard.com> wrote:
>> Any update on this? Thanks.
>>
> I ran into some unrelated issues and was delayed a bit on this. I'm
> compiling the images now and will try to get the testing done within 24
> hours.
Ok, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
2019-04-07 9:28 ` Peter Korsgaard
@ 2019-04-08 4:35 ` Christian Stewart
2019-04-08 6:12 ` Peter Korsgaard
0 siblings, 1 reply; 15+ messages in thread
From: Christian Stewart @ 2019-04-08 4:35 UTC (permalink / raw)
To: buildroot
Hi Peter,
Peter Korsgaard <peter@korsgaard.com> writes:
> > I ran into some unrelated issues and was delayed a bit on this. I'm
> > compiling the images now and will try to get the testing done within 24
> > hours.
>
> Ok, thanks.
Looks good from initial tests. I see it's been merged as well.
Best regards,
Christian
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
2019-04-08 4:35 ` Christian Stewart
@ 2019-04-08 6:12 ` Peter Korsgaard
0 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-08 6:12 UTC (permalink / raw)
To: buildroot
>>>>> "Christian" == Christian Stewart <christian@paral.in> writes:
> Hi Peter,
> Peter Korsgaard <peter@korsgaard.com> writes:
>> > I ran into some unrelated issues and was delayed a bit on this. I'm
>> > compiling the images now and will try to get the testing done within 24
>> > hours.
>>
>> Ok, thanks.
> Looks good from initial tests. I see it's been merged as well.
Thanks for checking!
Yes, Thomas merged it yesterday.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4
2019-04-01 18:23 [Buildroot] [PATCH 0/7] Bump docker packages to v18.09.4 Peter Korsgaard
` (7 preceding siblings ...)
[not found] ` <87mul8vgj8.fsf@paral.in>
@ 2019-04-14 21:15 ` Peter Korsgaard
8 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2019-04-14 21:15 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:
> Bump the docker packages to the v18.09.4 release.
> Unit test is still successful:
> ./support/testing/run-tests -o output-test tests.package.test_docker_compose
> 19:38:21 TestDockerCompose Starting
> 19:38:23 TestDockerCompose Building
> 20:14:18 TestDockerCompose Building done
> 20:15:03 TestDockerCompose Cleaning up
> .
> Ran 1 test in 2211.902s
> OK
> Peter Korsgaard (7):
> package/runc: bump to version 1.0.0-rc7
> Revert "package/runc: blacklist Codesourcery ARM toolchain"
> Revert "runc: depend on linux headers >= 3.11 for O_TMPFILE"
> package/docker-containerd: bump version to v1.2.5
> package/docker-containerd: refer to official website
> package/docker-engine: bump to version v18.09.4
> package/docker-cli: bump to version v18.09.4
Committed to 2019.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 15+ messages in thread