commit 8c4c05ddcfc30107b967b204d491523685460226 Author: Nicolas Vigier boklm@torproject.org Date: Tue Sep 19 20:31:22 2017 +0200

Bug 23585: fix build with runc version 1.0.0~rc2

Some distributions are packaging runc version 1.0.0~rc2, which seems to be half between runc 0.1.1 and runc 1.0.0.

This version requires the same command line parameters as version 1.0.0, however it requires a config.json in the same format as 0.1.1.

The output from `runc --version` on 1.0.0~rc2 is: runc version spec: 1.0.0-rc2-dev

So we add a var/runc_spec100 function which is true when the runc version spec is exactly 1.0.0 (as returned by runc stable 1.0.x releases), and use it in projects/common/runc-config.json. --- projects/common/runc-config.json | 6 +++--- rbm.conf | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index a4386c6..7a88805 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -1,5 +1,5 @@ { - "ociVersion": "1.0.0[% IF !c("var_p/runc100") %]-rc1[% END %]", + "ociVersion": "1.0.0[% IF !c("var_p/runc_spec100") %]-rc1[% END %]", "platform": { "os": "linux", [% IF c("var/container/arch") == 'i386' -%] @@ -22,7 +22,7 @@ "TERM=xterm" ], "cwd": "/", -[% IF c("var_p/runc100") -%] +[% IF c("var_p/runc_spec100") -%] "capabilities": { "bounding": [ "CAP_AUDIT_WRITE", @@ -250,7 +250,7 @@ "/proc/kcore", "/proc/latency_stats", "/proc/timer_stats", -[% IF c("var_p/runc100") -%] +[% IF c("var_p/runc_spec100") -%] "/proc/timer_list", "/sys/firmware", [% END -%] diff --git a/rbm.conf b/rbm.conf index 0b0193d..c433f00 100644 --- a/rbm.conf +++ b/rbm.conf @@ -379,5 +379,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, + # runc_spec100 is true if runc spec is exactly 1.0.0 + # We will need to update this when there is a new spec version available + runc_spec100 => sub { + my ($out) = capture_exec('sudo', 'runc', '--version'); + return $out =~ m/^runc version spec: 1.0.0$/; + }, }, )