Skip to content

Commit 31fb008

Browse files
jankaluzajankaluza
committed
Do not merge: Try switching to monorepo dependencies.
Signed-off-by: Jan Kaluza <[email protected]>
1 parent b7de827 commit 31fb008

File tree

1,147 files changed

+5303
-33135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,147 files changed

+5303
-33135
lines changed

‎add.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ import (
2323
"github.com/containers/buildah/define"
2424
"github.com/containers/buildah/internal/tmpdir"
2525
"github.com/containers/buildah/pkg/chrootuser"
26-
"github.com/containers/common/pkg/retry"
27-
"github.com/containers/image/v5/pkg/tlsclientconfig"
28-
"github.com/containers/image/v5/types"
29-
"github.com/containers/storage/pkg/fileutils"
30-
"github.com/containers/storage/pkg/idtools"
31-
"github.com/containers/storage/pkg/regexp"
3226
"github.com/docker/go-connections/tlsconfig"
3327
"github.com/hashicorp/go-multierror"
3428
"github.com/moby/sys/userns"
3529
digest "github.com/opencontainers/go-digest"
3630
v1 "github.com/opencontainers/image-spec/specs-go/v1"
3731
"github.com/opencontainers/runtime-spec/specs-go"
3832
"github.com/sirupsen/logrus"
33+
"go.podman.io/common/pkg/retry"
34+
"go.podman.io/image/v5/pkg/tlsclientconfig"
35+
"go.podman.io/image/v5/types"
36+
"go.podman.io/storage/pkg/fileutils"
37+
"go.podman.io/storage/pkg/idtools"
38+
"go.podman.io/storage/pkg/regexp"
3939
)
4040

4141
// AddAndCopyOptions holds options for add and copy commands.

‎bind/mount.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import (
1111
"syscall"
1212

1313
"github.com/containers/buildah/util"
14-
"github.com/containers/storage/pkg/idtools"
15-
"github.com/containers/storage/pkg/mount"
1614
"github.com/opencontainers/runtime-spec/specs-go"
1715
"github.com/sirupsen/logrus"
16+
"go.podman.io/storage/pkg/idtools"
17+
"go.podman.io/storage/pkg/mount"
1818
"golang.org/x/sys/unix"
1919
)
2020

‎buildah.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import (
1313

1414
"github.com/containers/buildah/define"
1515
"github.com/containers/buildah/docker"
16-
nettypes "github.com/containers/common/libnetwork/types"
17-
"github.com/containers/image/v5/types"
1816
encconfig "github.com/containers/ocicrypt/config"
19-
"github.com/containers/storage"
20-
"github.com/containers/storage/pkg/ioutils"
2117
v1 "github.com/opencontainers/image-spec/specs-go/v1"
2218
"github.com/sirupsen/logrus"
19+
nettypes "go.podman.io/common/libnetwork/types"
20+
"go.podman.io/image/v5/types"
21+
"go.podman.io/storage"
22+
"go.podman.io/storage/pkg/ioutils"
2323
)
2424

2525
const (

‎buildah_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ import (
66
"os"
77
"testing"
88

9-
imagetypes "github.com/containers/image/v5/types"
10-
"github.com/containers/storage"
11-
"github.com/containers/storage/types"
129
"github.com/sirupsen/logrus"
1310
"github.com/stretchr/testify/assert"
1411
"github.com/stretchr/testify/require"
12+
imagetypes "go.podman.io/image/v5/types"
13+
"go.podman.io/storage"
14+
"go.podman.io/storage/types"
1515
)
1616

1717
var testSystemContext = imagetypes.SystemContext{

‎chroot/run_common.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"github.com/containers/buildah/bind"
2121
"github.com/containers/buildah/internal/pty"
2222
"github.com/containers/buildah/util"
23-
"github.com/containers/storage/pkg/ioutils"
24-
"github.com/containers/storage/pkg/reexec"
25-
"github.com/containers/storage/pkg/unshare"
2623
"github.com/opencontainers/runtime-spec/specs-go"
2724
"github.com/sirupsen/logrus"
25+
"go.podman.io/storage/pkg/ioutils"
26+
"go.podman.io/storage/pkg/reexec"
27+
"go.podman.io/storage/pkg/unshare"
2828
"golang.org/x/sys/unix"
2929
"golang.org/x/term"
3030
)

‎chroot/run_freebsd.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
"syscall"
1515

1616
"github.com/containers/buildah/pkg/jail"
17-
"github.com/containers/storage/pkg/fileutils"
18-
"github.com/containers/storage/pkg/mount"
19-
"github.com/containers/storage/pkg/unshare"
2017
"github.com/opencontainers/runtime-spec/specs-go"
2118
"github.com/sirupsen/logrus"
19+
"go.podman.io/storage/pkg/fileutils"
20+
"go.podman.io/storage/pkg/mount"
21+
"go.podman.io/storage/pkg/unshare"
2222
"golang.org/x/sys/unix"
2323
)
2424

‎chroot/run_linux.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"time"
1515

1616
"github.com/containers/buildah/copier"
17-
"github.com/containers/storage/pkg/mount"
18-
"github.com/containers/storage/pkg/unshare"
1917
"github.com/moby/sys/capability"
2018
"github.com/opencontainers/runc/libcontainer/apparmor"
2119
"github.com/opencontainers/runtime-spec/specs-go"
2220
"github.com/sirupsen/logrus"
21+
"go.podman.io/storage/pkg/mount"
22+
"go.podman.io/storage/pkg/unshare"
2323
"golang.org/x/sys/unix"
2424
)
2525

‎chroot/run_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import (
1616

1717
"github.com/containers/buildah/tests/testreport/types"
1818
"github.com/containers/buildah/util"
19-
"github.com/containers/storage/pkg/mount"
20-
"github.com/containers/storage/pkg/reexec"
2119
specs "github.com/opencontainers/runtime-spec/specs-go"
2220
"github.com/opencontainers/runtime-tools/generate"
2321
"github.com/stretchr/testify/assert"
2422
"github.com/stretchr/testify/require"
23+
"go.podman.io/storage/pkg/mount"
24+
"go.podman.io/storage/pkg/reexec"
2525
"golang.org/x/sys/unix"
2626
)
2727

‎chroot/seccomp_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"fmt"
77
"os"
88

9-
"github.com/containers/common/pkg/seccomp"
109
specs "github.com/opencontainers/runtime-spec/specs-go"
10+
"go.podman.io/common/pkg/seccomp"
1111
)
1212

1313
const seccompAvailable = true

‎cmd/buildah/addcopy.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"github.com/containers/buildah"
1313
"github.com/containers/buildah/pkg/cli"
1414
"github.com/containers/buildah/pkg/parse"
15-
"github.com/containers/common/pkg/auth"
16-
"github.com/containers/storage"
1715
"github.com/sirupsen/logrus"
1816
"github.com/spf13/cobra"
1917
"github.com/spf13/pflag"
18+
"go.podman.io/common/pkg/auth"
19+
"go.podman.io/storage"
2020
)
2121

2222
type addCopyResults struct {

0 commit comments

Comments
 (0)