1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
From: Mathias Gibbens <gibmat@debian.org>
Description: Adjust import paths to reflect Debian packaging
Forwarded: not-needed
diff --git a/e2e/internal/e2e/docker_auth_server.go b/e2e/internal/e2e/docker_auth_server.go
index d4b0fee..e41e9a2 100644
--- a/e2e/internal/e2e/docker_auth_server.go
+++ b/e2e/internal/e2e/docker_auth_server.go
@@ -18,7 +18,7 @@ import (
"sync"
"time"
- "github.com/adigunhammedolalekan/registry-auth"
+ "github.com/adxgun/registry-auth"
)
const (
diff --git a/internal/pkg/build/oci/oci.go b/internal/pkg/build/oci/oci.go
index dcf000d..1a09a03 100644
--- a/internal/pkg/build/oci/oci.go
+++ b/internal/pkg/build/oci/oci.go
@@ -21,12 +21,12 @@ import (
"github.com/apptainer/apptainer/internal/pkg/cache"
"github.com/apptainer/apptainer/internal/pkg/ociimage"
"github.com/apptainer/apptainer/pkg/sylog"
- "github.com/containers/image/v5/copy"
- "github.com/containers/image/v5/docker"
- "github.com/containers/image/v5/oci/layout"
- "github.com/containers/image/v5/signature"
- "github.com/containers/image/v5/transports"
- "github.com/containers/image/v5/types"
+ "go.podman.io/image/copy"
+ "go.podman.io/image/docker"
+ "go.podman.io/image/oci/layout"
+ "go.podman.io/image/signature"
+ "go.podman.io/image/transports"
+ "go.podman.io/image/types"
)
// ImageReference wraps containers/image ImageReference type
diff --git a/internal/pkg/build/oci/oci_test.go b/internal/pkg/build/oci/oci_test.go
index 2054dd2..822a314 100644
--- a/internal/pkg/build/oci/oci_test.go
+++ b/internal/pkg/build/oci/oci_test.go
@@ -23,8 +23,8 @@ import (
"github.com/apptainer/apptainer/internal/pkg/ociimage"
"github.com/apptainer/apptainer/internal/pkg/test"
buildTypes "github.com/apptainer/apptainer/pkg/build/types"
- "github.com/containers/image/v5/oci/layout"
- "github.com/containers/image/v5/types"
+ "go.podman.io/image/oci/layout"
+ "go.podman.io/image/types"
)
const (
diff --git a/internal/pkg/client/oci/transports.go b/internal/pkg/client/oci/transports.go
index 77f8a76..b87d0df 100644
--- a/internal/pkg/client/oci/transports.go
+++ b/internal/pkg/client/oci/transports.go
@@ -10,7 +10,7 @@
package oci
import (
- "github.com/containers/image/v5/transports"
+ "go.podman.io/image/transports"
)
// IsSupported returns whether or not the transport given is supported. To fit within a switch/case
diff --git a/internal/pkg/client/oci/transports_test.go b/internal/pkg/client/oci/transports_test.go
index f18a3ff..d4fed91 100644
--- a/internal/pkg/client/oci/transports_test.go
+++ b/internal/pkg/client/oci/transports_test.go
@@ -12,7 +12,7 @@ package oci
import (
"testing"
- "github.com/containers/image/v5/transports"
+ "go.podman.io/image/transports"
)
func TestIsSupported(t *testing.T) {
diff --git a/internal/pkg/ociimage/sourcesink.go b/internal/pkg/ociimage/sourcesink.go
index 8873f40..d07f06a 100644
--- a/internal/pkg/ociimage/sourcesink.go
+++ b/internal/pkg/ociimage/sourcesink.go
@@ -18,9 +18,9 @@ import (
progressClient "github.com/apptainer/apptainer/internal/pkg/client"
"github.com/apptainer/apptainer/internal/pkg/util/ociauth"
"github.com/apptainer/apptainer/pkg/sylog"
- "github.com/containers/image/v5/docker/reference"
- "github.com/containers/image/v5/pkg/sysregistriesv2"
- "github.com/containers/image/v5/types"
+ "go.podman.io/image/docker/reference"
+ "go.podman.io/image/pkg/sysregistriesv2"
+ "go.podman.io/image/types"
"github.com/docker/docker/client"
"github.com/google/go-containerregistry/pkg/name"
v1 "github.com/google/go-containerregistry/pkg/v1"
diff --git a/internal/pkg/ociimage/transport.go b/internal/pkg/ociimage/transport.go
index 0a88b0f..f48c735 100644
--- a/internal/pkg/ociimage/transport.go
+++ b/internal/pkg/ociimage/transport.go
@@ -17,13 +17,13 @@ import (
"strings"
"github.com/apptainer/apptainer/pkg/util/slice"
- "github.com/containers/image/v5/docker"
- dockerarchive "github.com/containers/image/v5/docker/archive"
- dockerdaemon "github.com/containers/image/v5/docker/daemon"
- ociarchive "github.com/containers/image/v5/oci/archive"
- ocilayout "github.com/containers/image/v5/oci/layout"
- "github.com/containers/image/v5/signature"
- "github.com/containers/image/v5/types"
+ "go.podman.io/image/docker"
+ dockerarchive "go.podman.io/image/docker/archive"
+ dockerdaemon "go.podman.io/image/docker/daemon"
+ ociarchive "go.podman.io/image/oci/archive"
+ ocilayout "go.podman.io/image/oci/layout"
+ "go.podman.io/image/signature"
+ "go.podman.io/image/types"
"github.com/google/go-containerregistry/pkg/authn"
v1 "github.com/google/go-containerregistry/pkg/v1"
)
diff --git a/pkg/build/types/bundle.go b/pkg/build/types/bundle.go
index 00bb44a..5c64716 100644
--- a/pkg/build/types/bundle.go
+++ b/pkg/build/types/bundle.go
@@ -38,7 +38,7 @@ import (
"github.com/apptainer/apptainer/pkg/sylog"
"github.com/apptainer/apptainer/pkg/util/cryptkey"
keyClient "github.com/apptainer/container-key-client/client"
- ocitypes "github.com/containers/image/v5/types"
+ ocitypes "go.podman.io/image/types"
"github.com/google/go-containerregistry/pkg/authn"
ggcrv1 "github.com/google/go-containerregistry/pkg/v1"
"golang.org/x/sys/unix"
|
