Skip to content

Commit

Permalink
Merge pull request #47219 from thaJeztah/24.0_backport_gocompat
Browse files Browse the repository at this point in the history
[24.0 backport] add //go:build directives to prevent downgrading to go1.16 language
  • Loading branch information
thaJeztah committed Jan 25, 2024
2 parents 3205a51 + 73e729f commit 70d91b6
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 2 deletions.
3 changes: 3 additions & 0 deletions api/server/router/system/system.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package system // import "github.com/docker/docker/api/server/router/system"

import (
Expand Down
3 changes: 3 additions & 0 deletions builder/builder-next/adapters/containerimage/pull.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package containerimage

import (
Expand Down
3 changes: 3 additions & 0 deletions daemon/container_operations.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package daemon // import "github.com/docker/docker/daemon"

import (
Expand Down
3 changes: 3 additions & 0 deletions daemon/daemon.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

// Package daemon exposes the functions that occur on the host server
// that the Docker daemon is running.
//
Expand Down
3 changes: 3 additions & 0 deletions daemon/info.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package daemon // import "github.com/docker/docker/daemon"

import (
Expand Down
3 changes: 3 additions & 0 deletions daemon/inspect.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package daemon // import "github.com/docker/docker/daemon"

import (
Expand Down
3 changes: 3 additions & 0 deletions libnetwork/config/config.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package config

import (
Expand Down
4 changes: 2 additions & 2 deletions libnetwork/drivers/overlay/peerdb.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:build linux
// +build linux
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19 && linux

package overlay

Expand Down
3 changes: 3 additions & 0 deletions libnetwork/endpoint.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package libnetwork

import (
Expand Down
3 changes: 3 additions & 0 deletions libnetwork/internal/setmatrix/setmatrix.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package setmatrix

import (
Expand Down
3 changes: 3 additions & 0 deletions libnetwork/network.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package libnetwork

import (
Expand Down
3 changes: 3 additions & 0 deletions libnetwork/options/options.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

// Package options provides a way to pass unstructured sets of options to a
// component expecting a strongly-typed configuration structure.
package options
Expand Down
3 changes: 3 additions & 0 deletions libnetwork/service.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package libnetwork

import (
Expand Down
3 changes: 3 additions & 0 deletions testutil/helpers.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.19

package testutil // import "github.com/docker/docker/testutil"

import (
Expand Down

0 comments on commit 70d91b6

Please sign in to comment.