diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 078ca6e..0173553 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -134,7 +134,7 @@ jobs: echo 'TimeoutStopSec=1' >> test.service echo 'ExecStart=/usr/local/bin/out-of-tree kernel autogen --threads=4 --max=256 --shuffle' >> test.service echo 'ExecStart=/usr/local/bin/out-of-tree pew --qemu-timeout=10m --threads=4 --include-internal-errors' >> test.service - echo 'ExecStart=PATH=$:PATH/usr/bin /usr/local/bin/out-of-tree container save' >> test.service + echo 'ExecStart=/usr/local/bin/out-of-tree container save' >> test.service echo "ExecStart=/usr/bin/s3cmd put --acl-public *.tar.gz s3://out-of-tree/1.0.0/containers/ --host=fra1.digitaloceanspaces.com --host-bucket='%(bucket)s.fra1.digitaloceanspaces.com' --access_key=${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} --secret_key=${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}" >> test.service scp test.service root@$IP:/etc/systemd/system/test.service diff --git a/cmd/container.go b/cmd/container.go index 41def0d..446da86 100644 --- a/cmd/container.go +++ b/cmd/container.go @@ -56,7 +56,7 @@ func (cmd ContainerSaveCmd) Run(containerCmd *ContainerCmd) (err error) { nlog := log.With().Str("name", name).Logger() output := filepath.Join(cmd.OutDir, name+".tar") - nlog.Info().Msgf("saving to %v") + nlog.Info().Msgf("saving to %v", output) err = container.Save(name, output) if err != nil { diff --git a/container/container.go b/container/container.go index 09c4132..17e38b8 100644 --- a/container/container.go +++ b/container/container.go @@ -103,7 +103,7 @@ func Save(name, path string) (err error) { return } - cmd := exec.Command(Runtime, "save", name, path) + cmd := exec.Command(Runtime, "save", name, "-o", path) log.Debug().Msgf("%v", cmd) raw, err := cmd.CombinedOutput()