marc/courgette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: tidy podman driver, remove redundant command setup

Browse source
This commit is contained in:
Marc 2024-09-02 00:46:21 -04:00
parent 7466ad21a9
commit 23eef5de24
Signed by: marc
GPG key ID: 048E042F22B5DC79
1 changed files with 17 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
internal/driver/podman_driver.go
View file

@ -10,18 +10,21 @@ import (
"os/exec"
)
type PodmanDriver struct{}
func (d PodmanDriver) Pull(uri string) error {
cmd := exec.Command("podman", "pull", uri)
// Executes a Podman command and pipes output to stdout/stderr.
//
// The exec.Cmd pointer returned isn't ran.
func podmanCommand(args ...string) *exec.Cmd {
cmd := exec.Command("podman", args...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
return err
return cmd
}
return nil
type PodmanDriver struct{}
func (d PodmanDriver) Pull(uri string) error {
return podmanCommand("pull", uri).Run()
}
// Sets up a new container with an attached workspace volume.
@ -30,19 +33,12 @@ func (d PodmanDriver) Pull(uri string) error {
// can be easily collected and cleaned up on stop.
func (d PodmanDriver) Start(uri string, containerName string) error {
volumeName := fmt.Sprintf("%s-workspace", containerName)
cmd := exec.Command("podman", "volume", "create", volumeName, "--label", fmt.Sprintf("owner=%s", containerName))
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
if err := podmanCommand("volume", "create", volumeName, "--label", fmt.Sprintf("owner=%s", containerName)).Run(); err != nil {
return err
}
cmd = exec.Command("podman", "run", "-td", "--name", containerName, "-v", fmt.Sprintf("%s:/workspace", volumeName), uri)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
if err := podmanCommand("run", "-td", "--name", containerName, "-v", fmt.Sprintf("%s:/workspace", volumeName), uri).Run(); err != nil {
return err
}
@ -52,27 +48,15 @@ func (d PodmanDriver) Start(uri string, containerName string) error {
// Stops a container and removes any volumes labelled with its name
// as owner.
func (d PodmanDriver) Stop(containerName string) error {
cmd := exec.Command("podman", "rm", "-f", "-t", "2", containerName)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
if err := podmanCommand("rm", "-f", "-t", "2", containerName).Run(); err != nil {
return err
}
cmd = exec.Command("podman", "wait", containerName, "--ignore")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
if err := podmanCommand("wait", containerName, "--ignore").Run(); err != nil {
logger.Error("%+v", err)
}
cmd = exec.Command("podman", "volume", "prune", "--filter", fmt.Sprintf("label=owner=%s", containerName), "-f")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
if err := podmanCommand("volume", "prune", "--filter", fmt.Sprintf("label=owner=%s", containerName), "-f").Run(); err != nil {
return err
}
@ -100,9 +84,7 @@ func (d PodmanDriver) Exec(containerId string, command string, options CommandOp
command,
)
cmd := exec.Command("podman", commandArgs...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd := podmanCommand(commandArgs...)
err := cmd.Run()
return CommandResult{