add containerd cli opts

Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher
2020-10-19 14:49:15 +03:00
parent a1427d0b7b
commit 865ed8a1ce
2 changed files with 35 additions and 1 deletions

View File

@@ -8,6 +8,7 @@ import (
"os"
"os/exec"
"path/filepath"
"strings"
"syscall"
"time"
@@ -17,6 +18,10 @@ import (
log "github.com/sirupsen/logrus"
)
const (
containerdOptsFile = "/etc/containerd/cli-opts"
)
func cleanupTask(ctx context.Context, ctr containerd.Container) error {
task, err := ctr.Task(ctx, nil)
if err != nil {
@@ -78,8 +83,14 @@ func systemInitCmd(ctx context.Context, args []string) {
// remove (unlikely) old containerd socket
_ = os.Remove(*sock)
// look for containerd options
ctrdArgs := []string{}
if b, err := ioutil.ReadFile(containerdOptsFile); err != nil {
ctrdArgs = strings.Fields(string(b))
}
// start up containerd
cmd := exec.Command(*binary)
cmd := exec.Command(*binary, ctrdArgs...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Start(); err != nil {