commit 946d493f800fa39fadba61fa0440a35074d0bbd5 Author: Nicolas Vigier boklm@torproject.org Date: Fri Nov 17 23:14:39 2017 +0100

Bug 24341: update platform.arch to avoid error with some runc versions

The runc versions after this commit: https://github.com/opencontainers/runc/commit/1cd050244e004bc9940787f888b457... and before this commit: https://github.com/opencontainers/runc/commit/e1146182a8cebb5a6133a9e298a5e4... cannot run containers where platform.arch is set to anything else than amd64 when running on amd64.

The platform.arch is not used for anything so we can set it to amd64 in all cases to avoid the error with that runc version. --- projects/common/runc-config.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index 7a88805..e75c13d 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -2,11 +2,7 @@ "ociVersion": "1.0.0[% IF !c("var_p/runc_spec100") %]-rc1[% END %]", "platform": { "os": "linux", -[% IF c("var/container/arch") == 'i386' -%] - "arch": "386" -[% ELSE -%] - "arch": "[% c("var/container/arch") %]" -[% END -%] + "arch": "amd64" }, "process": { "terminal": [% IF c("interactive") %]true[% ELSE %]false[% END %],