From 0c2d3b718d473157c0e97ebc4e8b217332c1358a Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 9 Dec 2019 17:42:14 -0800 Subject: [PATCH 1/2] Fix privileged devices. Signed-off-by: Lantao Liu --- pkg/server/container_create_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/server/container_create_unix.go b/pkg/server/container_create_unix.go index 6f3b8963f..2793c21f2 100644 --- a/pkg/server/container_create_unix.go +++ b/pkg/server/container_create_unix.go @@ -170,7 +170,7 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3 } specOpts = append(specOpts, oci.WithPrivileged) if !ociRuntime.PrivilegedWithoutHostDevices { - specOpts = append(specOpts, oci.WithHostDevices) + specOpts = append(specOpts, oci.WithHostDevices, oci.WithAllDevicesAllowed) } } else { // not privileged specOpts = append(specOpts, customopts.WithDevices(c.os, config), customopts.WithCapabilities(securityContext)) From 78e6d6175e0f913351ccb4a084b0d7aacf0cee49 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Tue, 10 Dec 2019 13:18:49 -0800 Subject: [PATCH 2/2] Update golang to 1.13.4. Signed-off-by: Lantao Liu --- .appveyor.yml | 3 ++- .travis.yml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 8c2af5ec1..cd151e9a8 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -8,8 +8,9 @@ environment: GOPATH: C:\gopath PATH: C:\go\bin;C:\tools\mingw64\bin;$(PATH) CGO_ENABLED: 1 + GO111MODULE: off matrix: - - GO_VERSION: 1.12.9 + - GO_VERSION: 1.13.4 install: # Install Mingw diff --git a/.travis.yml b/.travis.yml index 868b661ad..2d6f4ec5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ git: language: go go: - - 1.12.x + - 1.13.4 - tip @@ -13,6 +13,9 @@ matrix: sudo: required +env: + - GO111MODULE=off + services: - docker