opencontainers · AkihiroSuda · Sep 2, 2021 · Aug 27, 2021 · Aug 27, 2021 · Aug 31, 2021
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 ## Introduction
 
-`runc` is a CLI tool for spawning and running containers according to the OCI specification.
+`runc` is a CLI tool for spawning and running containers on Linux according to the OCI specification.
 
 ## Releases
 
@@ -23,8 +23,7 @@ A third party security audit was performed by Cure53, you can see the full repor
 
 ## Building
 
-`runc` currently supports the Linux platform with various architecture support.
-It must be built with Go version 1.15 or higher.
+`runc` only supports Linux. It must be built with Go version 1.15 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

diff --git a/checkpoint.go b/checkpoint.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (

diff --git a/delete.go b/delete.go
@@ -1,5 +1,3 @@
-// +build !solaris
-
 package main
 
 import (

diff --git a/events.go b/events.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (

diff --git a/exec.go b/exec.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (

diff --git a/kill.go b/kill.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (

diff --git a/libcontainer/apparmor/apparmor_unsupported.go b/libcontainer/apparmor/apparmor_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package apparmor

diff --git a/libcontainer/capabilities/capabilities.go b/libcontainer/capabilities/capabilities.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package capabilities

diff --git a/libcontainer/capabilities/capabilities_unsupported.go b/libcontainer/capabilities/capabilities_unsupported.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package capabilities
diff --git a/libcontainer/cgroups/cgroups.go b/libcontainer/cgroups/cgroups.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (

diff --git a/libcontainer/cgroups/cgroups_test.go b/libcontainer/cgroups/cgroups_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (

diff --git a/libcontainer/cgroups/cgroups_unsupported.go b/libcontainer/cgroups/cgroups_unsupported.go
diff --git a/libcontainer/cgroups/devices/devices_emulator.go b/libcontainer/cgroups/devices/devices_emulator.go
@@ -1,5 +1,3 @@
-// +build linux
-
 // SPDX-License-Identifier: Apache-2.0
 /*
  * Copyright (C) 2020 Aleksa Sarai <cyphar@cyphar.com>

diff --git a/libcontainer/cgroups/file_test.go b/libcontainer/cgroups/file_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (

diff --git a/libcontainer/cgroups/fs/blkio.go b/libcontainer/cgroups/fs/blkio.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/blkio_test.go b/libcontainer/cgroups/fs/blkio_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/cpu.go b/libcontainer/cgroups/fs/cpu.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/cpu_test.go b/libcontainer/cgroups/fs/cpu_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/cpuacct.go b/libcontainer/cgroups/fs/cpuacct.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/cpuacct_test.go b/libcontainer/cgroups/fs/cpuacct_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/cpuset_test.go b/libcontainer/cgroups/fs/cpuset_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/devices.go b/libcontainer/cgroups/fs/devices.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/devices_test.go b/libcontainer/cgroups/fs/devices_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/freezer.go b/libcontainer/cgroups/fs/freezer.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/freezer_test.go b/libcontainer/cgroups/fs/freezer_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/fs.go b/libcontainer/cgroups/fs/fs.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/fs_test.go b/libcontainer/cgroups/fs/fs_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/hugetlb.go b/libcontainer/cgroups/fs/hugetlb.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/hugetlb_test.go b/libcontainer/cgroups/fs/hugetlb_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/memory_test.go b/libcontainer/cgroups/fs/memory_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/name.go b/libcontainer/cgroups/fs/name.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/net_cls.go b/libcontainer/cgroups/fs/net_cls.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/net_cls_test.go b/libcontainer/cgroups/fs/net_cls_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/net_prio.go b/libcontainer/cgroups/fs/net_prio.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/net_prio_test.go b/libcontainer/cgroups/fs/net_prio_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/perf_event.go b/libcontainer/cgroups/fs/perf_event.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/pids.go b/libcontainer/cgroups/fs/pids.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/pids_test.go b/libcontainer/cgroups/fs/pids_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/stats_util_test.go b/libcontainer/cgroups/fs/stats_util_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs
 
 import (

diff --git a/libcontainer/cgroups/fs/unsupported.go b/libcontainer/cgroups/fs/unsupported.go
diff --git a/libcontainer/cgroups/fs/util_test.go b/libcontainer/cgroups/fs/util_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 /*
 Utility for testing cgroup operations.
 

diff --git a/libcontainer/cgroups/fs2/cpu.go b/libcontainer/cgroups/fs2/cpu.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/cpuset.go b/libcontainer/cgroups/fs2/cpuset.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/devices.go b/libcontainer/cgroups/fs2/devices.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/freezer.go b/libcontainer/cgroups/fs2/freezer.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/fs2.go b/libcontainer/cgroups/fs2/fs2.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/hugetlb.go b/libcontainer/cgroups/fs2/hugetlb.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/io.go b/libcontainer/cgroups/fs2/io.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/memory.go b/libcontainer/cgroups/fs2/memory.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fs2/pids.go b/libcontainer/cgroups/fs2/pids.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fs2
 
 import (

diff --git a/libcontainer/cgroups/fscommon/utils.go b/libcontainer/cgroups/fscommon/utils.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fscommon
 
 import (

diff --git a/libcontainer/cgroups/fscommon/utils_test.go b/libcontainer/cgroups/fscommon/utils_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package fscommon
 
 import (

diff --git a/libcontainer/cgroups/getallpids.go b/libcontainer/cgroups/getallpids.go
@@ -1,4 +1,5 @@
-// +build linux,go1.16
+//go:build go1.16
+// +build go1.16
 
 package cgroups
 

diff --git a/libcontainer/cgroups/getallpids_go115.go b/libcontainer/cgroups/getallpids_go115.go
@@ -1,4 +1,5 @@
-// +build linux,!go1.16
+//go:build !go1.16
+// +build !go1.16
 
 package cgroups
 

diff --git a/libcontainer/cgroups/getallpids_test.go b/libcontainer/cgroups/getallpids_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 import (

diff --git a/libcontainer/cgroups/stats.go b/libcontainer/cgroups/stats.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package cgroups
 
 type ThrottlingData struct {

diff --git a/libcontainer/cgroups/systemd/dbus.go b/libcontainer/cgroups/systemd/dbus.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package systemd
 
 import (