Merge pull request #3419 from kolyshkin/go1.18

Add / switch to Go 1.18

.cirrus.yml

@@ -50,7 +50,7 @@ task:
     mkdir -p -m 0700 /root/.ssh
     vagrant ssh-config >> /root/.ssh/config
   guest_info_script: |
-    ssh default 'sh -exc "uname -a && systemctl --version && df -T && cat /etc/os-release"'
+    ssh default 'sh -exc "uname -a && systemctl --version && df -T && cat /etc/os-release && go version"'
   unit_tests_script: |
     ssh default 'sudo -i make -C /vagrant localunittest'
   integration_systemd_script: |
@@ -68,7 +68,7 @@ task:
   env:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
-    GO_VERSION: "1.17.3"
+    GO_VERSION: "1.18"
     BATS_VERSION: "v1.3.0"
     # yamllint disable rule:key-duplicates
     matrix:

.github/workflows/test.yml

@@ -21,13 +21,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.16.x, 1.17.x, 1.18.0-beta1]
+        go-version: [1.17.x, 1.18.x]
         rootless: ["rootless", ""]
         race: ["-race", ""]
         criu: [""]
         include:
           # Also test against latest criu-dev
-          - go-version: 1.17.x
+          - go-version: 1.18.x
             rootless: ""
             race: ""
             criu: "criu-dev"

.github/workflows/validate.yml

@@ -8,7 +8,7 @@ on:
       - release-*
   pull_request:
 env:
-  GO_VERSION: 1.17.x
+  GO_VERSION: 1.18.x
 
 jobs:
 
@@ -25,7 +25,7 @@ jobs:
           sudo apt -q install libseccomp-dev
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.44
+          version: v1.45
 
   lint-extra:
     # Extra linters, only checking new code from pull requests.
@@ -46,7 +46,7 @@ jobs:
         with:
           only-new-issues: true
           args: --config .golangci-extra.yml
-          version: v1.44
+          version: v1.45
 
 
   compile-buildtags:

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.17
+ARG GO_VERSION=1.18
 ARG BATS_VERSION=v1.3.0
 ARG LIBSECCOMP_VERSION=2.5.3
 

README.md

@@ -24,7 +24,7 @@ A third party security audit was performed by Cure53, you can see the full repor
 
 ## Building
 
-`runc` only supports Linux. It must be built with Go version 1.16 or higher.
+`runc` only supports Linux. It must be built with Go version 1.17 or higher.
 
 In order to enable seccomp support you will need to install `libseccomp` on your platform.
 > e.g. `libseccomp-devel` for CentOS, or `libseccomp-dev` for Ubuntu

Vagrantfile.fedora

@@ -23,12 +23,17 @@ Vagrant.configure("2") do |config|
       cat << EOF | dnf -y --exclude=kernel,kernel-core shell && break
 config install_weak_deps false
 update
-install iptables gcc make golang-go glibc-static libseccomp-devel bats jq git-core criu fuse-sshfs
+install iptables gcc make glibc-static libseccomp-devel bats jq git-core criu fuse-sshfs
 ts run
 EOF
     done
     dnf clean all
 
+    # Install golang.
+    # FIXME go back to golang-go rpm once switched to Fedora 36.
+    curl -fsSL https://go.dev/dl/go1.18.linux-amd64.tar.gz | tar Cxz /usr/local
+    echo 'export PATH=/usr/local/go/bin:$PATH' >> /etc/profile.d/golang.sh
+
     # Add a user for rootless tests
     useradd -u2000 -m -d/home/rootless -s/bin/bash rootless
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/opencontainers/runc
 
-go 1.16
+go 1.17
 
 require (
 	github.com/checkpoint-restore/go-criu/v5 v5.3.0
@@ -24,3 +24,10 @@ require (
 	golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c
 	google.golang.org/protobuf v1.27.1
 )
+
+require (
+	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
+)

libcontainer/container_linux.go

@@ -920,7 +920,7 @@ func (c *linuxContainer) criuSupportsExtNS(t configs.NamespaceType) bool {
 }
 
 func criuNsToKey(t configs.NamespaceType) string {
-	return "extRoot" + strings.Title(configs.NsName(t)) + "NS"
+	return "extRoot" + strings.Title(configs.NsName(t)) + "NS" //nolint:staticcheck // SA1019: strings.Title is deprecated
 }
 
 func (c *linuxContainer) handleCheckpointingExternalNamespaces(rpcOpts *criurpc.CriuOpts, t configs.NamespaceType) error {

libcontainer/devices/device_unix_test.go

@@ -64,7 +64,7 @@ func TestHostDevicesIoutilReadDirDeepFailure(t *testing.T) {
 			t.Fatalf("Unexpected error %v", err)
 		}
 
-		return []fs.DirEntry{fileInfoToDirEntry(fi)}, nil
+		return []fs.DirEntry{fs.FileInfoToDirEntry(fi)}, nil
 	}
 	defer cleanupTest()