Merge pull request #45475 from thaJeztah/remove_old_buildtags

api/common_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package api // import "github.com/docker/docker/api"
 

api/types/container/hostconfig_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/api/types/container"
 

api/types/container/hostconfig_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container
 

builder/builder-next/executor_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package buildkit
 

builder/builder-next/worker/gc_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package worker
 

builder/builder-next/worker/gc_windows.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package worker
 

builder/dockerfile/builder_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 

builder/dockerfile/copy_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 

builder/dockerfile/dispatchers_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 

builder/dockerfile/dispatchers_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 

builder/dockerfile/dispatchers_windows_test.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 

builder/dockerfile/internals_windows_test.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package dockerfile // import "github.com/docker/docker/builder/dockerfile"
 

client/client_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package client // import "github.com/docker/docker/client"
 

cmd/dockerd/config_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package main
 

cmd/dockerd/config_unix_test.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package main
 

cmd/dockerd/daemon_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

cmd/dockerd/daemon_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

cmd/dockerd/docker_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

cmd/dockerd/service_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package main
 

cmd/dockerd/trap/trap_linux_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package trap // import "github.com/docker/docker/cmd/dockerd/trap"
 

container/container_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/container"
 

container/mounts_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/container"
 

daemon/apparmor_default.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/apparmor_default_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/archive_tarcopyoptions_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/archive_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/cluster/executor/container/health_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 

daemon/cluster/executor/container/validate_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 

daemon/cluster/executor/container/validate_windows_test.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package container // import "github.com/docker/docker/daemon/cluster/executor/container"
 import (

daemon/cluster/listen_addr_others.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package cluster // import "github.com/docker/docker/daemon/cluster"
 

daemon/configs_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/container_linux.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/container_operations_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/container_unix_test.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon
 

daemon/create_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/daemon_linux_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/daemon_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/daemon_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/daemon_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd && !windows
-// +build !linux,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/daemon_windows_test.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/debugtrap_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/debugtrap_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !darwin && !freebsd && !windows
-// +build !linux,!darwin,!freebsd,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/exec_linux_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon
 

daemon/graphdriver/btrfs/btrfs.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
 

daemon/graphdriver/btrfs/btrfs_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"
 

daemon/graphdriver/btrfs/dummy_unsupported.go

@@ -1,4 +1,3 @@
 //go:build !linux || !cgo
-// +build !linux !cgo
 
 package btrfs // import "github.com/docker/docker/daemon/graphdriver/btrfs"

daemon/graphdriver/driver_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !windows && !freebsd
-// +build !linux,!windows,!freebsd
 
 package graphdriver // import "github.com/docker/docker/daemon/graphdriver"
 

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"
 

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"
 

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs_unsupported.go

@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package fuseoverlayfs // import "github.com/docker/docker/daemon/graphdriver/fuse-overlayfs"

daemon/graphdriver/graphtest/graphbench_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"
 

daemon/graphdriver/graphtest/graphtest_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"
 

daemon/graphdriver/graphtest/testutil_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package graphtest // import "github.com/docker/docker/daemon/graphdriver/graphtest"
 

daemon/graphdriver/overlay2/check.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 

daemon/graphdriver/overlay2/mount.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 

daemon/graphdriver/overlay2/overlay.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 

daemon/graphdriver/overlay2/overlay_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"
 

daemon/graphdriver/overlay2/overlay_unsupported.go

@@ -1,4 +1,3 @@
 //go:build !linux
-// +build !linux
 
 package overlay2 // import "github.com/docker/docker/daemon/graphdriver/overlay2"

daemon/graphdriver/register/register_btrfs.go

@@ -1,5 +1,4 @@
 //go:build !exclude_graphdriver_btrfs && linux
-// +build !exclude_graphdriver_btrfs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 

daemon/graphdriver/register/register_fuseoverlayfs.go

@@ -1,5 +1,4 @@
 //go:build !exclude_graphdriver_fuseoverlayfs && linux
-// +build !exclude_graphdriver_fuseoverlayfs,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 

daemon/graphdriver/register/register_overlay2.go

@@ -1,5 +1,4 @@
 //go:build !exclude_graphdriver_overlay2 && linux
-// +build !exclude_graphdriver_overlay2,linux
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 

daemon/graphdriver/register/register_zfs.go

@@ -1,5 +1,4 @@
 //go:build (!exclude_graphdriver_zfs && linux) || (!exclude_graphdriver_zfs && freebsd)
-// +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd
 
 package register // import "github.com/docker/docker/daemon/graphdriver/register"
 

daemon/graphdriver/vfs/copy_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 

daemon/graphdriver/vfs/quota_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 

daemon/graphdriver/vfs/vfs_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package vfs // import "github.com/docker/docker/daemon/graphdriver/vfs"
 

daemon/graphdriver/zfs/zfs.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs"
 

daemon/graphdriver/zfs/zfs_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs"
 

daemon/graphdriver/zfs/zfs_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package zfs // import "github.com/docker/docker/daemon/graphdriver/zfs"
 

daemon/images/image_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package images // import "github.com/docker/docker/daemon/images"
 

daemon/info_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/info_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/keys.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/keys_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/list_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/listeners/group_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package listeners // import "github.com/docker/docker/daemon/listeners"
 

daemon/logger/gelf/gelf_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package gelf // import "github.com/docker/docker/daemon/logger/gelf"
 

daemon/logger/journald/internal/sdjournal/sdjournal.go

@@ -1,5 +1,4 @@
 //go:build linux && cgo && !static_build && journald
-// +build linux,cgo,!static_build,journald
 
 package sdjournal // import "github.com/docker/docker/daemon/logger/journald/internal/sdjournal"
 

daemon/logger/journald/journald.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 

daemon/logger/journald/journald_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 

daemon/logger/journald/read.go

@@ -1,5 +1,4 @@
 //go:build linux && cgo && !static_build && journald
-// +build linux,cgo,!static_build,journald
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 

daemon/logger/journald/read_test.go

@@ -1,5 +1,4 @@
 //go:build linux && cgo && !static_build && journald
-// +build linux,cgo,!static_build,journald
 
 package journald // import "github.com/docker/docker/daemon/logger/journald"
 

daemon/logger/loggerutils/file_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package loggerutils
 

daemon/logger/loggerutils/logfile_race_test.go

@@ -1,5 +1,4 @@
 //go:build race
-// +build race
 
 package loggerutils // import "github.com/docker/docker/daemon/logger/loggerutils"
 

daemon/logger/plugin_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package logger // import "github.com/docker/docker/daemon/logger"
 

daemon/logger/plugin_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !freebsd
-// +build !linux,!freebsd
 
 package logger // import "github.com/docker/docker/daemon/logger"
 

daemon/metrics_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/metrics_unsupported.go

@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/network/filter_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package network // import "github.com/docker/docker/daemon/network"
 

daemon/reload_unix.go

@@ -1,5 +1,4 @@
 //go:build linux || freebsd
-// +build linux freebsd
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/resize_test.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package daemon
 

daemon/runtime_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon
 

daemon/runtime_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon
 

daemon/seccomp_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/secrets_unsupported.go

@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/start_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/stats/collector_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package stats // import "github.com/docker/docker/daemon/stats"
 

daemon/stats_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/top_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/top_unix_test.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"
 

daemon/volumes_unix.go

@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package daemon // import "github.com/docker/docker/daemon"