Merge pull request containers#828 from rhatdan/tmpdir

Set the environment variables for the engine

pkg/config/config.go

@@ -563,6 +563,10 @@ func NewConfig(userConfigPath string) (*Config, error) {
 		return nil, err
 	}
 
+	if err := config.setupEnv(); err != nil {
+		return nil, err
+	}
+
 	return config, nil
 }
 
@@ -1187,3 +1191,23 @@ func (c *Config) ImageCopyTmpDir() (string, error) {
 
 	return "", errors.Errorf("invalid image_copy_tmp_dir value %q (relative paths are not accepted)", c.Engine.ImageCopyTmpDir)
 }
+
+// setupEnv sets the environment variables for the engine
+func (c *Config) setupEnv() error {
+	for _, env := range c.Engine.Env {
+		splitEnv := strings.SplitN(env, "=", 2)
+		if len(splitEnv) != 2 {
+			logrus.Warnf("invalid environment variable for engine %s, valid configuration is KEY=value pair", env)
+			continue
+		}
+		// skip if the env is already defined
+		if _, ok := os.LookupEnv(splitEnv[0]); ok {
+			logrus.Debugf("environment variable %s is already defined, skip the settings from containers.conf", splitEnv[0])
+			continue
+		}
+		if err := os.Setenv(splitEnv[0], splitEnv[1]); err != nil {
+			return err
+		}
+	}
+	return nil
+}

pkg/config/config_local_test.go

@@ -203,12 +203,15 @@ var _ = Describe("Config Local", func() {
 
 	It("should return containers engine env", func() {
 		// Given
-		expectedEnv := []string{"http_proxy=internal.proxy.company.com", "foo=bar"}
+		expectedEnv := []string{"super=duper", "foo=bar"}
 		// When
 		config, err := NewConfig("testdata/containers_default.conf")
 		// Then
 		gomega.Expect(err).To(gomega.BeNil())
 		gomega.Expect(config.Engine.Env).To(gomega.BeEquivalentTo(expectedEnv))
+		gomega.Expect(os.Getenv("super")).To(gomega.BeEquivalentTo("duper"))
+		gomega.Expect(os.Getenv("foo")).To(gomega.BeEquivalentTo("bar"))
+
 	})
 
 	It("Expect Remote to be False", func() {

pkg/config/testdata/containers_default.conf

@@ -137,7 +137,7 @@ conmon_path = [
 # For example "http_proxy=internal.proxy.company.com".
 # Note these environment variables will not be used within the container.
 # Set the env section under [containers] table, if you want to set environment variables for the container.
-env = ["http_proxy=internal.proxy.company.com", "foo=bar"]
+env = ["super=duper", "foo=bar"]
 
 # Container init binary
 #init_path = "/usr/libexec/podman/catatonit"