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.

Sign up for GitHub

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

Jump to bottom

feat: refactor to use machinerun.io/atomfs #640

Merged
merged 1 commit into from
Sep 1, 2024
Merged

feat: refactor to use machinerun.io/atomfs #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/stacker/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"

cli "github.com/urfave/cli/v2"
"stackerbuild.io/stacker/pkg/squashfs"
"machinerun.io/atomfs/squashfs"
"stackerbuild.io/stacker/pkg/stacker"
"stackerbuild.io/stacker/pkg/types"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/stacker/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/opencontainers/umoci/oci/casext"
"github.com/pkg/errors"
cli "github.com/urfave/cli/v2"
stackeroci "stackerbuild.io/stacker/pkg/oci"
stackeroci "machinerun.io/atomfs/oci"
)

var inspectCmd = cli.Command{
Expand Down
2 changes: 1 addition & 1 deletion cmd/stacker/internal_go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/pkg/errors"
cli "github.com/urfave/cli/v2"
"golang.org/x/sys/unix"
"stackerbuild.io/stacker/pkg/atomfs"
"machinerun.io/atomfs"
"stackerbuild.io/stacker/pkg/lib"
"stackerbuild.io/stacker/pkg/log"
"stackerbuild.io/stacker/pkg/overlay"
Expand Down
2 changes: 1 addition & 1 deletion cmd/stacker/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package main
import (
"github.com/pkg/errors"
cli "github.com/urfave/cli/v2"
"machinerun.io/atomfs/squashfs"
"stackerbuild.io/stacker/pkg/lib"
"stackerbuild.io/stacker/pkg/squashfs"
"stackerbuild.io/stacker/pkg/stacker"
"stackerbuild.io/stacker/pkg/types"
)
Expand Down
12 changes: 8 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,22 @@ go 1.21.0
toolchain go1.21.6

require (
github.com/Masterminds/semver/v3 v3.2.1
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
github.com/apex/log v1.9.0
github.com/apparentlymart/go-shquot v0.0.1
github.com/cheggaaa/pb/v3 v3.1.2
github.com/containers/image/v5 v5.24.2
github.com/dustin/go-humanize v1.0.1
github.com/freddierice/go-losetup v0.0.0-20220711213114-2a14873012db
github.com/justincormack/go-memfd v0.0.0-20170219213707-6e4af0518993
github.com/klauspost/pgzip v1.2.6
github.com/lxc/go-lxc v0.0.0-20230926171149-ccae595aa49e
github.com/lxc/incus v0.3.1-0.20231215145534-1719ffcbab9d
github.com/martinjungblut/go-cryptsetup v0.0.0-20220520180014-fd0874fd07a6
github.com/minio/sha256-simd v1.0.1
github.com/mitchellh/hashstructure v1.1.0
github.com/moby/buildkit v0.11.4
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc4
github.com/opencontainers/umoci v0.0.0-00000000000000-000000000000
github.com/opencontainers/umoci v0.4.8-0.20220412065115-12453f247749
github.com/pkg/errors v0.9.1
github.com/pkg/xattr v0.4.9
github.com/sirupsen/logrus v1.9.3
Expand All @@ -41,6 +38,12 @@ require (
stackerbuild.io/stacker-bom v0.0.0-00010101000000-000000000000
)

require (
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/freddierice/go-losetup v0.0.0-20220711213114-2a14873012db // indirect
github.com/martinjungblut/go-cryptsetup v0.0.0-20220520180014-fd0874fd07a6 // indirect
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
Expand Down Expand Up @@ -274,6 +277,7 @@ require (
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
machinerun.io/atomfs v1.1.1
modernc.org/libc v1.37.6 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.7.2 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
machinerun.io/atomfs v1.1.1 h1:EprTiYMzAlKL+3S7woe9DsCJGwO2dkHTlvmjlVNO8pY=
machinerun.io/atomfs v1.1.1/go.mod h1:cidyEmsNeeo+9f7OiHl/nA+8KS7Vj5XOslR87VkIebM=
modernc.org/libc v1.37.6 h1:orZH3c5wmhIQFTXF+Nt+eeauyd+ZIt2BX6ARe+kD+aw=
modernc.org/libc v1.37.6/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
Expand Down
266 changes: 0 additions & 266 deletions pkg/atomfs/molecule.go
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions pkg/atomfs/molecule_test.go
View file
Open in desktop

This file was deleted.

Loading
Loading