From d1211604a72cb5773ea6690383c16c88705c4ebb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 16 Nov 2018 14:31:57 +0100 Subject: [PATCH] Add a note about updating runc / runc vendoring Containerd should be "leading" when specifying which version of runc to use. From the RUNC.MD document in the containerd repository (https://github.com/containerd/containerd/blob/b1e202c32724e82779544365528a1a082 b335553/RUNC.md); > We depend on a specific runc version when dealing with advanced features. You > should have a specific runc build for development. The current supported runc > commit is described in vendor.conf. Please refer to the line that starts with > github.com/opencontainers/runc. This patch adds a note to vendor.conf and runc.installer to describe the order in which runc should be updated. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit da3810d235bc0bd0197243d0128f258394554704) Signed-off-by: Sebastiaan van Stijn Upstream-commit: c9c87d76d651d57d72e52c575a2c9600170b5212 Component: engine --- components/engine/hack/dockerfile/install/runc.installer | 3 +++ components/engine/vendor.conf | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/components/engine/hack/dockerfile/install/runc.installer b/components/engine/hack/dockerfile/install/runc.installer index 18723dc605..32ef5f3dcb 100755 --- a/components/engine/hack/dockerfile/install/runc.installer +++ b/components/engine/hack/dockerfile/install/runc.installer @@ -1,6 +1,9 @@ #!/bin/sh # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly +# The version of runc should match the version that is used by the containerd +# version that is used. If you need to update runc, open a pull request in +# the containerd project first, and update both after that is merged. RUNC_COMMIT=9f1e94488e5e478e084fef997f022565b64b01d9 install_runc() { diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 0ec740f5dc..587e193694 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -74,7 +74,11 @@ github.com/pborman/uuid v1.0 google.golang.org/grpc v1.12.0 -# This does not need to match RUNC_COMMIT as it is used for helper packages but should be newer or equal +# The version of runc should match the version that is used by the containerd +# version that is used. If you need to update runc, open a pull request in +# the containerd project first, and update both after that is merged. +# This commit does not need to match RUNC_COMMIT as it is used for helper +# packages but should be newer or equal. github.com/opencontainers/runc 9f1e94488e5e478e084fef997f022565b64b01d9 github.com/opencontainers/runtime-spec 5684b8af48c1ac3b1451fa499724e30e3c20a294 # v1.0.1-49-g5684b8a github.com/opencontainers/image-spec v1.0.1