Pick default OCI Runtime from containers.conf

Currently we have a weird situation where the user sets the default runtime in his containers.conf for podman but Buildah is still falling back to use crun because it was hard coded as the default for Buildah. We are changing the default to "crun" but this should ONLY be used when the containers.conf load fails, which should never happen. I would like to remove this default, but that would theoretically break the API promise of Buildah. This should fix containers/podman#8893 Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Jan 21, 2021 · db28447 · db28447
1 parent d460e2e
commit db28447
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/util/types.go b/util/types.go
@@ -1,8 +1,9 @@
 package util
 
 const (
-	// DefaultRuntime is the default command to use to run the container.
-	DefaultRuntime = "runc"
+	// DefaultRuntime should no longer be used.
+	// Default runtime should come from containers.conf
+	DefaultRuntime = "crun"
 	// DefaultCNIPluginPath is the default location of CNI plugin helpers.
 	DefaultCNIPluginPath = "/usr/libexec/cni:/opt/cni/bin"
 	// DefaultCNIConfigDir is the default location of CNI configuration files.

diff --git a/util/util.go b/util/util.go
@@ -263,7 +263,12 @@ func Runtime() string {
 		return "crun"
 	}
 
-	return DefaultRuntime
+	conf, err := config.Default()
+	if err != nil {
+		logrus.Debugf("Error loading container config when searching for local runtime.")
+		return DefaultRuntime
+	}
+	return conf.Engine.OCIRuntime
 }
 
 // StringInSlice returns a boolean indicating if the exact value s is present

diff --git a/util/util_test.go b/util/util_test.go
@@ -2,7 +2,10 @@ package util
 
 import (
 	"fmt"
+	"os"
 	"testing"
+
+	"github.com/containers/common/pkg/config"
 )
 
 func TestMergeEnv(t *testing.T) {
@@ -37,3 +40,18 @@ func TestMergeEnv(t *testing.T) {
 		})
 	}
 }
+func TestRuntime(t *testing.T) {
+	os.Setenv("CONTAINERS_CONF", "/dev/null")
+	conf, _ := config.Default()
+	defaultRuntime := conf.Engine.OCIRuntime
+	runtime := Runtime()
+	if runtime != defaultRuntime {
+		t.Fatalf("expected %v, got %v", "crun", defaultRuntime)
+	}
+	defaultRuntime = "myoci"
+	os.Setenv("BUILDAH_RUNTIME", defaultRuntime)
+	runtime = Runtime()
+	if runtime != defaultRuntime {
+		t.Fatalf("expected %v, got %v", "crun", defaultRuntime)
+	}
+}