diff --git a/go.mod b/go.mod index f4adb9f4..575b6851 100644 --- a/go.mod +++ b/go.mod @@ -285,6 +285,6 @@ require ( ) replace ( - github.com/opencontainers/umoci => github.com/project-stacker/umoci v0.0.0-20240223003603-555a0af426e1 + github.com/opencontainers/umoci => github.com/project-stacker/umoci v0.0.0-20240329154438-26d688b0d7c1 stackerbuild.io/stacker-bom => github.com/project-stacker/stacker-bom v0.0.6-0.20240227180605-9a3eb8f7f720 ) diff --git a/go.sum b/go.sum index 37fe17a8..5e46abdf 100644 --- a/go.sum +++ b/go.sum @@ -799,8 +799,8 @@ github.com/proglottis/gpgme v0.1.3 h1:Crxx0oz4LKB3QXc5Ea0J19K/3ICfy3ftr5exgUK1AU github.com/proglottis/gpgme v0.1.3/go.mod h1:fPbW/EZ0LvwQtH8Hy7eixhp1eF3G39dtx7GUN+0Gmy0= github.com/project-stacker/stacker-bom v0.0.6-0.20240227180605-9a3eb8f7f720 h1:7XxHKp0cb8NfDVzZeP+Dgkx4/hdP6bXagwIRcZJNQiw= github.com/project-stacker/stacker-bom v0.0.6-0.20240227180605-9a3eb8f7f720/go.mod h1:Z6NhOFXmg2+eBNU77lGAZkiJWyATXix3ZdEJ53Gbkws= -github.com/project-stacker/umoci v0.0.0-20240223003603-555a0af426e1 h1:TtJDnPCi3mZU56pILbuQbXwmC3EEUJgOSop8NVkAKUE= -github.com/project-stacker/umoci v0.0.0-20240223003603-555a0af426e1/go.mod h1:XUXUpCpA/Y8aJWezK1i8o4WDR0Y/vhMcWg+FUNQkKMQ= +github.com/project-stacker/umoci v0.0.0-20240329154438-26d688b0d7c1 h1:7mz6NRnsINUr9yoYLxulCbkz3yFZZu0qZa7Sx8uV1nE= +github.com/project-stacker/umoci v0.0.0-20240329154438-26d688b0d7c1/go.mod h1:XUXUpCpA/Y8aJWezK1i8o4WDR0Y/vhMcWg+FUNQkKMQ= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= diff --git a/test/basic.bats b/test/basic.bats index d150de13..67811234 100644 --- a/test/basic.bats +++ b/test/basic.bats @@ -350,7 +350,25 @@ l3: mkdir -p /aaa/222/ab mkdir -p /ccc/222/ab mkdir -p /ddd/333/ab +l4: + from: + type: built + tag: l3 + run: | + [ ! -d /aaa/111 ] + [ -d /aaa/222/ab ] + [ -d /ccc/222 ] + [ ! -d /ccc/111 ] EOF + mkdir -p .stacker/layer-bases + chmod 777 .stacker/layer-bases + image_copy oci:$BUSYBOX_OCI oci:.stacker/layer-bases/oci:busybox + umoci unpack --image .stacker/layer-bases/oci:busybox dest + tar caf .stacker/layer-bases/busybox.tar -C dest/rootfs . + rm -rf dest + # did we really download the image to the right place? + [ -f .stacker/layer-bases/busybox.tar ] + stacker build umoci unpack --image oci:l3 l3