fix: move the oci folder out of the stacker binary's way

This is done by reorganizing the code into the pkg directory. Files from cmd/ were also moved to cmd/stacker, according to the go guidelines. Fixes #296 Fixes #332 Signed-off-by: Ariel Miculas <[email protected]>
project-stacker · Dec 14, 2022 · ca0e3dd · ca0e3dd
1 parent afe93e2
commit ca0e3dd
Show file tree

Hide file tree

Showing 74 changed files with 98 additions and 98 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 *.swp
 *.stacker
-stacker
-stacker-dynamic
+/stacker
+/stacker-dynamic
 .build
 
 # IDEs

diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ BUILD_TAGS = exclude_graphdriver_btrfs exclude_graphdriver_devicemapper containe
 
 STACKER_OPTS=--oci-dir=.build/oci --roots-dir=.build/roots --stacker-dir=.build/stacker --storage-type=overlay
 
-build_stacker = go build -tags "$(BUILD_TAGS) $1" -ldflags "-X main.version=$(VERSION_FULL) -X main.lxc_version=$(LXC_VERSION) $2" -o $3 ./cmd
+build_stacker = go build -tags "$(BUILD_TAGS) $1" -ldflags "-X main.version=$(VERSION_FULL) -X main.lxc_version=$(LXC_VERSION) $2" -o $3 ./cmd/stacker
 
 STACKER_DOCKER_BASE?=docker://
 STACKER_BUILD_BASE_IMAGE?=$(STACKER_DOCKER_BASE)alpine:edge
@@ -24,19 +24,19 @@ stacker: stacker-dynamic
 		--substitute LXC_CLONE_URL=$(LXC_CLONE_URL) \
 		--substitute LXC_BRANCH=$(LXC_BRANCH)
 
-stacker-static: $(GO_SRC) go.mod go.sum cmd/lxc-wrapper/lxc-wrapper
+stacker-static: $(GO_SRC) go.mod go.sum cmd/stacker/lxc-wrapper/lxc-wrapper
 	$(call build_stacker,static_build,-extldflags '-static',stacker)
 
 # TODO: because we clean lxc-wrapper in the nested build, this always rebuilds.
 # Could find a better way to do this.
-stacker-dynamic: $(GO_SRC) go.mod go.sum cmd/lxc-wrapper/lxc-wrapper
+stacker-dynamic: $(GO_SRC) go.mod go.sum cmd/stacker/lxc-wrapper/lxc-wrapper
 	$(call build_stacker,,,stacker-dynamic)
 
-cmd/lxc-wrapper/lxc-wrapper: cmd/lxc-wrapper/lxc-wrapper.c
-	make -C cmd/lxc-wrapper LDFLAGS=-static LDLIBS="$(shell pkg-config --static --libs lxc) -lpthread -ldl" lxc-wrapper
+cmd/stacker/lxc-wrapper/lxc-wrapper: cmd/stacker/lxc-wrapper/lxc-wrapper.c
+	make -C cmd/stacker/lxc-wrapper LDFLAGS=-static LDLIBS="$(shell pkg-config --static --libs lxc) -lpthread -ldl" lxc-wrapper
 
 .PHONY: lint
-lint: cmd/lxc-wrapper/lxc-wrapper $(GO_SRC)
+lint: cmd/stacker/lxc-wrapper/lxc-wrapper $(GO_SRC)
 	go mod tidy
 	go fmt ./... && ([ -z $(CI) ] || git diff --exit-code)
 	bash test/static-analysis.sh
@@ -69,4 +69,4 @@ vendorup:
 clean:
 	-unshare -Urm rm -rf stacker stacker-dynamic .build
 	-rm -r ./test/centos ./test/ubuntu
-	-make -C cmd/lxc-wrapper clean
+	-make -C cmd/stacker/lxc-wrapper clean
diff --git a/build.yaml b/build.yaml
@@ -86,5 +86,5 @@ build:
     export GOPATH=/stacker-tree/.build/gopath
     export LXC_VERSION=$(git -C /lxc rev-parse HEAD)
 
-    make -C /stacker-tree/cmd/lxc-wrapper clean
+    make -C /stacker-tree/cmd/stacker/lxc-wrapper clean
     make -C /stacker-tree stacker-static
diff --git a/cmd/build.go → cmd/stacker/build.go b/cmd/build.go → cmd/stacker/build.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
-	"stackerbuild.io/stacker/squashfs"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/squashfs"
+	"stackerbuild.io/stacker/pkg/stacker"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 var buildCmd = cli.Command{

diff --git a/cmd/check.go → cmd/stacker/check.go b/cmd/check.go → cmd/stacker/check.go
@@ -8,7 +8,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/pkg/xattr"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker/overlay"
+	"stackerbuild.io/stacker/pkg/overlay"
 )
 
 var checkCmd = cli.Command{

diff --git a/cmd/chroot.go → cmd/stacker/chroot.go b/cmd/chroot.go → cmd/stacker/chroot.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
-	"stackerbuild.io/stacker/container"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/container"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/stacker"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 var chrootCmd = cli.Command{

diff --git a/cmd/clean.go → cmd/stacker/clean.go b/cmd/clean.go → cmd/stacker/clean.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
-	"stackerbuild.io/stacker/log"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/stacker"
 )
 
 var cleanCmd = cli.Command{

diff --git a/cmd/gc.go → cmd/stacker/gc.go b/cmd/gc.go → cmd/stacker/gc.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
+	"stackerbuild.io/stacker/pkg/stacker"
 )
 
 var gcCmd = cli.Command{

diff --git a/cmd/grab.go → cmd/stacker/grab.go b/cmd/grab.go → cmd/stacker/grab.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
+	"stackerbuild.io/stacker/pkg/stacker"
 )
 
 var grabCmd = cli.Command{

diff --git a/cmd/inspect.go → cmd/stacker/inspect.go b/cmd/inspect.go → cmd/stacker/inspect.go
@@ -11,7 +11,7 @@ import (
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	stackeroci "stackerbuild.io/stacker/oci"
+	stackeroci "stackerbuild.io/stacker/pkg/oci"
 )
 
 var inspectCmd = cli.Command{

diff --git a/cmd/internal_go.go → cmd/stacker/internal_go.go b/cmd/internal_go.go → cmd/stacker/internal_go.go
@@ -10,10 +10,10 @@ import (
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 	"golang.org/x/sys/unix"
-	"stackerbuild.io/stacker/atomfs"
-	"stackerbuild.io/stacker/lib"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/overlay"
+	"stackerbuild.io/stacker/pkg/atomfs"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/overlay"
 )
 
 var internalGoCmd = cli.Command{

diff --git a/cmd/lxc-wrapper/.gitignore → cmd/stacker/lxc-wrapper/.gitignore b/cmd/lxc-wrapper/.gitignore → cmd/stacker/lxc-wrapper/.gitignore
diff --git a/cmd/lxc-wrapper/Makefile → cmd/stacker/lxc-wrapper/Makefile b/cmd/lxc-wrapper/Makefile → cmd/stacker/lxc-wrapper/Makefile
diff --git a/cmd/lxc-wrapper/lxc-wrapper.c → cmd/stacker/lxc-wrapper/lxc-wrapper.c b/cmd/lxc-wrapper/lxc-wrapper.c → cmd/stacker/lxc-wrapper/lxc-wrapper.c
diff --git a/cmd/main.go → cmd/stacker/main.go b/cmd/main.go → cmd/stacker/main.go
@@ -17,9 +17,9 @@ import (
 	"github.com/urfave/cli"
 	"golang.org/x/term"
 	"gopkg.in/yaml.v2"
-	"stackerbuild.io/stacker/container"
-	stackerlog "stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/container"
+	stackerlog "stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 var (

diff --git a/cmd/publish.go → cmd/stacker/publish.go b/cmd/publish.go → cmd/stacker/publish.go
@@ -3,10 +3,10 @@ package main
 import (
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
-	"stackerbuild.io/stacker/lib"
-	"stackerbuild.io/stacker/squashfs"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/squashfs"
+	"stackerbuild.io/stacker/pkg/stacker"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 var publishCmd = cli.Command{

diff --git a/cmd/recursive-build.go → cmd/stacker/recursive-build.go b/cmd/recursive-build.go → cmd/stacker/recursive-build.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
-	"stackerbuild.io/stacker/lib"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/stacker"
 )
 
 const stackerFilePathRegex = "\\/stacker.yaml$"

diff --git a/cmd/unpriv-setup.go → cmd/stacker/unpriv-setup.go b/cmd/unpriv-setup.go → cmd/stacker/unpriv-setup.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
+	"stackerbuild.io/stacker/pkg/stacker"
 )
 
 var unprivSetupCmd = cli.Command{

diff --git a/cmd/validate.go → cmd/stacker/validate.go b/cmd/validate.go → cmd/stacker/validate.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"stackerbuild.io/stacker"
+	"stackerbuild.io/stacker/pkg/stacker"
 )
 
 /*

diff --git a/atomfs/molecule.go → pkg/atomfs/molecule.go b/atomfs/molecule.go → pkg/atomfs/molecule.go
@@ -9,8 +9,8 @@ import (
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
-	"stackerbuild.io/stacker/mount"
-	"stackerbuild.io/stacker/squashfs"
+	"stackerbuild.io/stacker/pkg/mount"
+	"stackerbuild.io/stacker/pkg/squashfs"
 )
 
 type Molecule struct {

diff --git a/atomfs/molecule_test.go → pkg/atomfs/molecule_test.go b/atomfs/molecule_test.go → pkg/atomfs/molecule_test.go
diff --git a/atomfs/oci.go → pkg/atomfs/oci.go b/atomfs/oci.go → pkg/atomfs/oci.go
@@ -5,7 +5,7 @@ import (
 
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/umoci"
-	stackeroci "stackerbuild.io/stacker/oci"
+	stackeroci "stackerbuild.io/stacker/pkg/oci"
 )
 
 type MountOCIOpts struct {

diff --git a/container/container.go → pkg/container/container.go b/container/container.go → pkg/container/container.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/lxc/go-lxc"
 	"github.com/pkg/errors"
-	embed_exec "stackerbuild.io/stacker/embed-exec"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	embed_exec "stackerbuild.io/stacker/pkg/embed-exec"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 const (

diff --git a/container/idmap/idmap.go → pkg/container/idmap/idmap.go b/container/idmap/idmap.go → pkg/container/idmap/idmap.go
diff --git a/container/userns.go → pkg/container/userns.go b/container/userns.go → pkg/container/userns.go
@@ -6,10 +6,10 @@ import (
 	"os/exec"
 
 	"github.com/pkg/errors"
-	stackeridmap "stackerbuild.io/stacker/container/idmap"
-	embed_exec "stackerbuild.io/stacker/embed-exec"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	stackeridmap "stackerbuild.io/stacker/pkg/container/idmap"
+	embed_exec "stackerbuild.io/stacker/pkg/embed-exec"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 // A wrapper which executes userCmd in a namespace if stacker has not already

diff --git a/embed-exec/embed-exec.go → pkg/embed-exec/embed-exec.go b/embed-exec/embed-exec.go → pkg/embed-exec/embed-exec.go
diff --git a/lib/containers_storage/lib.go → pkg/lib/containers_storage/lib.go b/lib/containers_storage/lib.go → pkg/lib/containers_storage/lib.go
@@ -6,7 +6,7 @@ package containers_storage
 
 import (
 	"github.com/containers/image/v5/storage"
-	"stackerbuild.io/stacker/lib"
+	"stackerbuild.io/stacker/pkg/lib"
 )
 
 func init() {

diff --git a/lib/dag.go → pkg/lib/dag.go b/lib/dag.go → pkg/lib/dag.go
diff --git a/lib/dag_test.go → pkg/lib/dag_test.go b/lib/dag_test.go → pkg/lib/dag_test.go
diff --git a/lib/dir.go → pkg/lib/dir.go b/lib/dir.go → pkg/lib/dir.go
diff --git a/lib/file.go → pkg/lib/file.go b/lib/file.go → pkg/lib/file.go
diff --git a/lib/hash.go → pkg/lib/hash.go b/lib/hash.go → pkg/lib/hash.go
diff --git a/lib/image.go → pkg/lib/image.go b/lib/image.go → pkg/lib/image.go
diff --git a/lib/image_test.go → pkg/lib/image_test.go b/lib/image_test.go → pkg/lib/image_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/opencontainers/umoci/mutate"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/stretchr/testify/assert"
-	"stackerbuild.io/stacker/squashfs"
+	"stackerbuild.io/stacker/pkg/squashfs"
 )
 
 func createImage(dir string, tag string) error {

diff --git a/log/log.go → pkg/log/log.go b/log/log.go → pkg/log/log.go
diff --git a/mount/mountinfo.go → pkg/mount/mountinfo.go b/mount/mountinfo.go → pkg/mount/mountinfo.go
diff --git a/mtree/filter.go → pkg/mtree/filter.go b/mtree/filter.go → pkg/mtree/filter.go
diff --git a/oci/oci.go → pkg/oci/oci.go b/oci/oci.go → pkg/oci/oci.go
diff --git a/overlay/metadata.go → pkg/overlay/metadata.go b/overlay/metadata.go → pkg/overlay/metadata.go
@@ -10,9 +10,9 @@ import (
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/pkg/errors"
-	"stackerbuild.io/stacker/log"
-	stackeroci "stackerbuild.io/stacker/oci"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/log"
+	stackeroci "stackerbuild.io/stacker/pkg/oci"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 type overlayMetadata struct {

diff --git a/overlay/metadata_test.go → pkg/overlay/metadata_test.go b/overlay/metadata_test.go → pkg/overlay/metadata_test.go
diff --git a/overlay/overlay-dirs.go → pkg/overlay/overlay-dirs.go b/overlay/overlay-dirs.go → pkg/overlay/overlay-dirs.go
@@ -7,8 +7,8 @@ import (
 	ispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/opencontainers/umoci"
 	"github.com/pkg/errors"
-	"stackerbuild.io/stacker/lib"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 // generateOverlayDirsLayers generates oci layers from all overlay_dirs of this image

diff --git a/overlay/overlay.go → pkg/overlay/overlay.go b/overlay/overlay.go → pkg/overlay/overlay.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 var _ types.Storage = &overlay{}

diff --git a/overlay/pack.go → pkg/overlay/pack.go b/overlay/pack.go → pkg/overlay/pack.go
@@ -21,12 +21,12 @@ import (
 	"github.com/opencontainers/umoci/oci/layer"
 	"github.com/pkg/errors"
 	"github.com/pkg/xattr"
-	"stackerbuild.io/stacker/lib"
-	"stackerbuild.io/stacker/log"
-	stackeroci "stackerbuild.io/stacker/oci"
-	"stackerbuild.io/stacker/squashfs"
-	"stackerbuild.io/stacker/storage"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/log"
+	stackeroci "stackerbuild.io/stacker/pkg/oci"
+	"stackerbuild.io/stacker/pkg/squashfs"
+	"stackerbuild.io/stacker/pkg/storage"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 func safeOverlayName(d digest.Digest) string {

diff --git a/overlay/pool.go → pkg/overlay/pool.go b/overlay/pool.go → pkg/overlay/pool.go
diff --git a/overlay/unpriv-setup.go → pkg/overlay/unpriv-setup.go b/overlay/unpriv-setup.go → pkg/overlay/unpriv-setup.go
@@ -1,7 +1,7 @@
 package overlay
 
 import (
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 func UnprivSetup(config types.StackerConfig, uid, gid int) error {

diff --git a/squashfs/mediatype.go → pkg/squashfs/mediatype.go b/squashfs/mediatype.go → pkg/squashfs/mediatype.go
diff --git a/squashfs/squashfs.go → pkg/squashfs/squashfs.go b/squashfs/squashfs.go → pkg/squashfs/squashfs.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
-	"stackerbuild.io/stacker/log"
+	"stackerbuild.io/stacker/pkg/log"
 )
 
 var checkZstdSupported sync.Once

diff --git a/squashfs/verity.go → pkg/squashfs/verity.go b/squashfs/verity.go → pkg/squashfs/verity.go
@@ -78,7 +78,7 @@ import (
 	"github.com/martinjungblut/go-cryptsetup"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/unix"
-	"stackerbuild.io/stacker/mount"
+	"stackerbuild.io/stacker/pkg/mount"
 )
 
 const VerityRootHashAnnotation = "io.stackeroci.stacker.squashfs_verity_root_hash"

diff --git a/squashfs/verity_static.go → pkg/squashfs/verity_static.go b/squashfs/verity_static.go → pkg/squashfs/verity_static.go
diff --git a/squashfs/verity_test.go → pkg/squashfs/verity_test.go b/squashfs/verity_test.go → pkg/squashfs/verity_test.go
diff --git a/api.go → pkg/stacker/api.go b/api.go → pkg/stacker/api.go
diff --git a/base.go → pkg/stacker/base.go b/base.go → pkg/stacker/base.go
@@ -11,9 +11,9 @@ import (
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/opencontainers/umoci/oci/layer"
 	"github.com/pkg/errors"
-	"stackerbuild.io/stacker/lib"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 type BaseLayerOpts struct {

diff --git a/build.go → pkg/stacker/build.go b/build.go → pkg/stacker/build.go
@@ -16,9 +16,9 @@ import (
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v2"
-	"stackerbuild.io/stacker/container"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/container"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 const DefaultShell = "/bin/sh"

diff --git a/cache.go → pkg/stacker/cache.go b/cache.go → pkg/stacker/cache.go
@@ -17,9 +17,9 @@ import (
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/pkg/errors"
 	"github.com/vbatts/go-mtree"
-	"stackerbuild.io/stacker/lib"
-	"stackerbuild.io/stacker/log"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/lib"
+	"stackerbuild.io/stacker/pkg/log"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 const currentCacheVersion = 12

diff --git a/cache_test.go → pkg/stacker/cache_test.go b/cache_test.go → pkg/stacker/cache_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/opencontainers/umoci"
 	"github.com/opencontainers/umoci/oci/casext"
 	"github.com/stretchr/testify/assert"
-	"stackerbuild.io/stacker/types"
+	"stackerbuild.io/stacker/pkg/types"
 )
 
 func TestLayerHashing(t *testing.T) {