tools/out-of-tree
1
0
Fork 0
Code Releases Activity

fix: correct output path

Browse Source
This commit is contained in:
dump_stack() 2024-02-21 12:38:29 +00:00
parent fcd559124d
commit 30e0e5f554
Signed by: dump_stack
GPG Key ID: C9905BA72B5E02BB
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/e2e.yml vendored
View File

@ -134,7 +134,7 @@ jobs:
echo 'TimeoutStopSec=1' >> test.service 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 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=/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 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 scp test.service root@$IP:/etc/systemd/system/test.service

2
cmd/container.go
View File

@ -56,7 +56,7 @@ func (cmd ContainerSaveCmd) Run(containerCmd *ContainerCmd) (err error) {
nlog := log.With().Str("name", name).Logger() nlog := log.With().Str("name", name).Logger()
output := filepath.Join(cmd.OutDir, name+".tar") 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) err = container.Save(name, output)
if err != nil { if err != nil {

2
container/container.go
View File

@ -103,7 +103,7 @@ func Save(name, path string) (err error) {
return return
} }
cmd := exec.Command(Runtime, "save", name, path) cmd := exec.Command(Runtime, "save", name, "-o", path)
log.Debug().Msgf("%v", cmd) log.Debug().Msgf("%v", cmd)
raw, err := cmd.CombinedOutput() raw, err := cmd.CombinedOutput()