Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade go version to 1.18 #496

Open
wants to merge 2 commits into
base: v3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: "1.17"
go-version: "1.18"
- run: make test
- name: WriteGoList
run: go list -json -deps ./... > go.list
Expand Down
2 changes: 1 addition & 1 deletion docker/auth.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2015 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/change.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2014 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/client.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2013 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/client_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2016 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/client_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2016 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/container.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2013 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/distribution.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2017 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/env.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2014 Docker authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/event.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2014 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/exec.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2014 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/image.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2013 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/misc.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2013 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/network.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

// Copyright 2015 go-dockerclient authors. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/env.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/hosts.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/hosts_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/hosts_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/ip.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/opts.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/opts_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/opts_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/quotedstring.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/runtime.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/opts/ulimit.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package opts
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/archive.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/archive_linux.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/archive_other.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !linux
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/archive_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/archive_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/changes.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/changes_linux.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/changes_other.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !linux
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/changes_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/changes_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/copy.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/copy_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/copy_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/diff.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/example_changes.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build ignore
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/time_linux.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/time_unsupported.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !linux
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/whiteouts.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/archive/wrap.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package archive // import "github.com/ory/dockertest/v3/docker/pkg/archive"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/fileutils/fileutils.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/fileutils/fileutils_darwin.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/fileutils/fileutils_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build linux || freebsd
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/fileutils/fileutils_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package fileutils // import "github.com/ory/dockertest/v3/docker/pkg/fileutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/homedir/homedir_linux.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package homedir // import "github.com/ory/dockertest/v3/docker/pkg/homedir"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/homedir/homedir_others.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !linux
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/homedir/homedir_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/homedir/homedir_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package homedir // import "github.com/ory/dockertest/v3/docker/pkg/homedir"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/idtools/idtools.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/idtools/idtools_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/idtools/idtools_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/idtools/usergroupadd_linux.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package idtools // import "github.com/ory/dockertest/v3/docker/pkg/idtools"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/idtools/usergroupadd_unsupported.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !linux
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/idtools/utils_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/buffer.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/bytespipe.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/fswriters.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/readers.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/temp_unix.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

//go:build !windows
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/temp_windows.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/writeflusher.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down
2 changes: 1 addition & 1 deletion docker/pkg/ioutils/writers.go
@@ -1,4 +1,4 @@
// Copyright © 2023 Ory Corp
// Copyright © 2024 Ory Corp
// SPDX-License-Identifier: Apache-2.0

package ioutils // import "github.com/ory/dockertest/v3/docker/pkg/ioutils"
Expand Down