diff --git a/Makefile.darwin b/Makefile.darwin index 879cd29..974a032 100644 --- a/Makefile.darwin +++ b/Makefile.darwin @@ -21,8 +21,14 @@ FINCH_IMAGE_LOCATION ?= $(OS_OUTDIR)/$(FINCH_OS_BASENAME) FINCH_IMAGE_DIGEST ?= "sha512:$(FINCH_OS_DIGEST)" include $(CURDIR)/deps/container-runtime-full-archive.conf +ifneq ($(AARCH64_ARTIFACT_PATHING),) + AARCH64_ARTIFACT := "$(AARCH64_ARTIFACT_PATHING)/$(AARCH64_ARTIFACT)" +endif CONTAINER_RUNTIME_ARCHIVE_AARCH64_LOCATION ?= "$(ARTIFACT_BASE_URL)/$(AARCH64_ARTIFACT)" CONTAINER_RUNTIME_ARCHIVE_AARCH64_DIGEST ?= "sha256:$(AARCH64_256_DIGEST)" +ifneq ($(X86_64_ARTIFACT_PATHING),) + X86_64_ARTIFACT := "$(X86_64_ARTIFACT_PATHING)/$(X86_64_ARTIFACT)" +endif CONTAINER_RUNTIME_ARCHIVE_X86_64_LOCATION ?= "$(ARTIFACT_BASE_URL)/$(X86_64_ARTIFACT)" CONTAINER_RUNTIME_ARCHIVE_X86_64_DIGEST ?= "sha256:$(X86_64_256_DIGEST)" diff --git a/deps/container-runtime-full-archive.conf b/deps/container-runtime-full-archive.conf index 552c0a6..98dea16 100644 --- a/deps/container-runtime-full-archive.conf +++ b/deps/container-runtime-full-archive.conf @@ -1,7 +1,9 @@ -ARTIFACT_BASE_URL=https://github.com/containerd/nerdctl/releases/download/v1.7.7 +ARTIFACT_BASE_URL=https://deps.runfinch.com -AARCH64_ARTIFACT=nerdctl-full-1.7.7-linux-arm64.tar.gz -AARCH64_256_DIGEST=b161a20c0e41f9ad999e8411e23c58ece4b3e584ae90b4252b76a39eee4a0c31 +AARCH64_ARTIFACT_PATHING=aarch64 +AARCH64_ARTIFACT=nerdctl-full-2.0.2-50-gf917e5c1-linux-arm64.tar.gz +AARCH64_256_DIGEST=8614c6e742ea5e554cbd1db1a8766fbb1bcdfdd7a24e85d220b5d8e20cb4da79 -X86_64_ARTIFACT=nerdctl-full-1.7.7-linux-amd64.tar.gz -X86_64_256_DIGEST=a731eac93e8e9dda1a0d76dc1606438deb0668ea7d6bd5c5af436353ed9f65c5 +X86_64_ARTIFACT_PATHING=x86-64 +X86_64_ARTIFACT=nerdctl-full-2.0.2-50-gf917e5c1-linux-amd64.tar.gz +X86_64_256_DIGEST=9ba674aed39e6f09e596c1d33eaf2e5df2615ec8734ae3130d4fadf9811528d0 diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 02bf70b..cc27ca4 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -48,7 +48,10 @@ func TestE2e(t *testing.T) { vmName := "fedora" - nerdctlOpt, err := option.New([]string{subject, "shell", vmName, "sudo", "-E", "nerdctl"}) + nerdctlOpt, err := option.New( + []string{subject, "shell", vmName, "sudo", "-E", "nerdctl"}, + option.WithNoEnvironmentVariablePassthrough(), + ) if err != nil { t.Fatalf("failed to initialize a testing option: %v", err) } diff --git a/e2e/go.mod b/e2e/go.mod index e2ee319..c42821f 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -1,21 +1,23 @@ module finch-core -go 1.22 +go 1.22.0 + +toolchain go1.23.4 require ( - github.com/onsi/ginkgo/v2 v2.20.2 + github.com/onsi/ginkgo/v2 v2.22.1 github.com/onsi/gomega v1.36.1 - github.com/runfinch/common-tests v0.7.22 + github.com/runfinch/common-tests v0.9.0 ) require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect + github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/text v0.21.0 // indirect - golang.org/x/tools v0.24.0 // indirect + golang.org/x/tools v0.28.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/e2e/go.sum b/e2e/go.sum index c7213c6..907aa5c 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -6,16 +6,16 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA= -github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= -github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= -github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= +github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/runfinch/common-tests v0.7.22 h1:LnQiSrQmmYUIc600FVsMk265kPnzCeFw94DbbCVDOwo= -github.com/runfinch/common-tests v0.7.22/go.mod h1:zzjBhz8poviFC3/kOmmJsUdiKGxMRoAh/AIUyy3YqGQ= +github.com/runfinch/common-tests v0.9.0 h1:6ncmCVfaHPdDD2mzXJTjIYBOD0MwtxJV9JkCdnCaJbQ= +github.com/runfinch/common-tests v0.9.0/go.mod h1:vkWvXw8vc4f9LQFTYT1Fc6Q4eJvrBvunx4yn5WUjpiE= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= @@ -24,8 +24,8 @@ golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= -golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=