Skip to content
This repository has been archived by the owner on Feb 1, 2024. It is now read-only.

Commit

Permalink
Several changes
Browse files Browse the repository at this point in the history
 - Change all instances of itxaka for rancher-sandbox as this is no
longer hosted on my own fork
 - Bump all deps
 - Update luet deps and change some methods that changed signature

Signed-off-by: Itxaka <[email protected]>
  • Loading branch information
Itxaka committed Apr 12, 2022
1 parent fd11b08 commit 413bf8d
Show file tree
Hide file tree
Showing 18 changed files with 1,022 additions and 665 deletions.
4 changes: 2 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
builds:
- ldflags:
- -w -s
- -X github.com/itxaka/luet-mtree/internal/version.version={{.Tag}}
- -X github.com/itxaka/luet-mtree/internal/version.gitCommit={{.Commit}}
- -X github.com/rancher-sandbox/luet-mtree/internal/version.version={{.Tag}}
- -X github.com/rancher-sandbox/luet-mtree/internal/version.gitCommit={{.Commit}}
env:
- CGO_ENABLED=0
goos:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ GIT_TAG = $(shell git describe --tags 2>/dev/null || echo "v.0.0.1" )

PKG := ./...
LDFLAGS := -w -s
LDFLAGS += -X "github.com/itxaka/luet-mtree/internal/version.version=${GIT_TAG}"
LDFLAGS += -X "github.com/itxaka/luet-mtree/internal/version.gitCommit=${GIT_COMMIT}"
LDFLAGS += -X "github.com/rancher-sandbox/luet-mtree/internal/version.version=${GIT_TAG}"
LDFLAGS += -X "github.com/rancher-sandbox/luet-mtree/internal/version.gitCommit=${GIT_COMMIT}"

LUET?=/usr/bin/luet
BACKEND?=docker
Expand Down
4 changes: 2 additions & 2 deletions cmd/check.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package cmd

import (
"github.com/itxaka/luet-mtree/pkg/action"
"github.com/itxaka/luet-mtree/pkg/log"
"github.com/rancher-sandbox/luet-mtree/pkg/action"
"github.com/rancher-sandbox/luet-mtree/pkg/log"
"github.com/spf13/cobra"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package cmd

import (
"encoding/json"
"github.com/itxaka/luet-mtree/pkg/action"
"github.com/rancher-sandbox/luet-mtree/pkg/action"
"os"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package cmd

import (
"errors"
"github.com/itxaka/luet-mtree/pkg/action"
"github.com/itxaka/luet-mtree/pkg/log"
"github.com/rancher-sandbox/luet-mtree/pkg/action"
"github.com/rancher-sandbox/luet-mtree/pkg/log"
"github.com/spf13/cobra"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package cmd

import (
"github.com/itxaka/luet-mtree/pkg/log"
"github.com/rancher-sandbox/luet-mtree/pkg/log"
"github.com/spf13/cobra"
"os"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package cmd

import (
"fmt"
"github.com/itxaka/luet-mtree/internal/version"
"github.com/rancher-sandbox/luet-mtree/internal/version"
"github.com/spf13/cobra"
)

Expand Down
149 changes: 80 additions & 69 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,92 +1,103 @@
module github.com/itxaka/luet-mtree
module github.com/rancher-sandbox/luet-mtree

go 1.18

require (
github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible
github.com/gabriel-vasile/mimetype v1.3.0
github.com/klauspost/compress v1.8.3
github.com/mudler/go-pluggable v0.0.0-20210513155700-54c6443073af
github.com/mudler/luet v0.0.0-20210601205410-5cccc34f32c0
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.6.1
github.com/vbatts/go-mtree v0.5.0
github.com/docker/docker v20.10.14+incompatible
github.com/gabriel-vasile/mimetype v1.4.0
github.com/klauspost/compress v1.15.1
github.com/mudler/go-pluggable v0.0.0-20211206135551-9263b05c562e
github.com/mudler/luet v0.0.0-20220323170407-18881c328394
github.com/spf13/cobra v1.4.0
github.com/stretchr/testify v1.7.0
github.com/vbatts/go-mtree v0.5.1
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/Microsoft/go-winio v0.4.15-0.20200113171025-3fe6c5262873 // indirect
github.com/Microsoft/hcsshim v0.8.7 // indirect
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/Microsoft/hcsshim v0.9.2 // indirect
github.com/Sabayon/pkgs-checker v0.10.5 // indirect
github.com/atomicgo/cursor v0.0.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/chuckpreslar/emission v0.0.0-20170206194824-a7ddd980baf9 // indirect
github.com/containerd/cgroups v0.0.0-20200217135630-d732e370d46d // indirect
github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc // indirect
github.com/containerd/continuity v0.0.0-20200228182428-0f16d7a0959c // indirect
github.com/containerd/ttrpc v0.0.0-20200121165050-0be804eadb15 // indirect
github.com/containerd/cgroups v1.0.3 // indirect
github.com/containerd/containerd v1.6.2 // indirect
github.com/containerd/continuity v0.3.0 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.11.3 // indirect
github.com/crillab/gophersat v1.3.2-0.20210701121804-72b19f5b6b38 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/cli v0.0.0-20200227165822-2298e6a3fe24 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.3 // indirect
github.com/docker/cli v20.10.14+incompatible // indirect
github.com/docker/distribution v2.8.1+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/genuinetools/img v0.5.11 // indirect
github.com/gofrs/flock v0.7.1 // indirect
github.com/gogo/googleapis v1.3.2 // indirect
github.com/gogo/protobuf v1.3.1 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/shlex v0.0.0-20150127133951-6f45313302b9 // indirect
github.com/gorilla/mux v1.7.4 // indirect
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/google/go-containerregistry v0.8.0 // indirect
github.com/google/renameio v1.0.1 // indirect
github.com/gookit/color v1.5.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/go-version v1.4.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/klauspost/cpuid v1.2.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/miekg/pkcs11 v1.0.2 // indirect
github.com/mitchellh/hashstructure v1.0.0 // indirect
github.com/moby/buildkit v0.7.2 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/sys/mount v0.2.0 // indirect
github.com/moby/sys/mountinfo v0.4.0 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/ipfs/go-log/v2 v2.5.1 // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d // indirect
github.com/kyokomi/emoji v2.2.4+incompatible // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/miekg/pkcs11 v1.1.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
github.com/moby/moby v20.10.14+incompatible // indirect
github.com/moby/sys/mount v0.3.1 // indirect
github.com/moby/sys/mountinfo v0.6.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/mudler/topsort v0.0.0-20201103161459-db5c7901c290 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/opencontainers/runc v1.0.0-rc9.0.20200221051241-688cf6d43cc4 // indirect
github.com/opentracing-contrib/go-stdlib v0.0.0-20180702182724-07a764486eb1 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runc v1.1.1 // indirect
github.com/otiai10/copy v1.7.0 // indirect
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
github.com/philopon/go-toposort v0.0.0-20170620085441-9be86dbd762f // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.3.0 // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.7.0 // indirect
github.com/prometheus/procfs v0.0.8 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
github.com/prometheus/common v0.33.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/pterm/pterm v0.12.40 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/spf13/afero v1.8.2 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.10.1 // indirect
github.com/theupdateframework/notary v0.7.0 // indirect
github.com/tonistiigi/fsutil v0.0.0-20200326231323-c2c7d7b0e144 // indirect
go.etcd.io/bbolt v1.3.5 // indirect
go.opencensus.io v0.22.3 // indirect
golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 // indirect
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
golang.org/x/sys v0.0.0-20210603125802-9665404d3644 // indirect
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect
google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece // indirect
google.golang.org/grpc v1.29.1 // indirect
google.golang.org/protobuf v1.24.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)

replace (
github.com/containerd/containerd v1.4.0-0 => github.com/containerd/containerd v1.4.0
github.com/docker/docker v0.0.0 => github.com/docker/docker v20.10.5+incompatible
github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
github.com/vbatts/tar-split v0.11.2 // indirect
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/sys v0.0.0-20220412071739-889880a91fd5 // indirect
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
google.golang.org/grpc v1.45.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/ini.v1 v1.66.4 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
Loading

0 comments on commit 413bf8d

Please sign in to comment.