summaryrefslogtreecommitdiff
path: root/cmd/kpod/create_cli.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-11-07 10:03:46 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2017-11-20 16:25:31 +0000
commit57599f0075ccab859d4158f7ee891b9b971c731f (patch)
tree84bb48fc3ef1321a29816710cbb1221cc598b745 /cmd/kpod/create_cli.go
parent3b72af614777b966671ad0eb0c5dbde0eeedcfa2 (diff)
downloadpodman-57599f0075ccab859d4158f7ee891b9b971c731f.tar.gz
podman-57599f0075ccab859d4158f7ee891b9b971c731f.tar.bz2
podman-57599f0075ccab859d4158f7ee891b9b971c731f.zip
Fix up handling of environment variables
The way docker works is if a user specifies a non `-e Name=Value`, IE just a `-e Name`, then the environment variable Name from the clients OS.ENV is used. Also by default Docker containers run with the HOSTNAME environment set to the HOSTNAME specified for the container. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #21 Approved by: baude
Diffstat (limited to 'cmd/kpod/create_cli.go')
-rw-r--r--cmd/kpod/create_cli.go32
1 files changed, 1 insertions, 31 deletions
diff --git a/cmd/kpod/create_cli.go b/cmd/kpod/create_cli.go
index eaad46591..91e984785 100644
--- a/cmd/kpod/create_cli.go
+++ b/cmd/kpod/create_cli.go
@@ -7,44 +7,14 @@ import (
)
func getAllLabels(labelFile, inputLabels []string) (map[string]string, error) {
- var labelValues []string
labels := make(map[string]string)
- labelValues, labelErr := readKVStrings(labelFile, inputLabels)
+ labelErr := readKVStrings(labels, labelFile, inputLabels)
if labelErr != nil {
return labels, errors.Wrapf(labelErr, "unable to process labels from --label and label-file")
}
- // Process KEY=VALUE stringslice in string map for WithLabels func
- if len(labelValues) > 0 {
- for _, i := range labelValues {
- spliti := strings.Split(i, "=")
- if len(spliti) < 2 {
- return labels, errors.Errorf("labels must be in KEY=VALUE format: %s is invalid", i)
- }
- labels[spliti[0]] = spliti[1]
- }
- }
return labels, nil
}
-func getAllEnvironmentVariables(envFiles, envInput []string) ([]string, error) {
- env, err := readKVStrings(envFiles, envInput)
- if err != nil {
- return []string{}, errors.Wrapf(err, "unable to process variables from --env and --env-file")
- }
- // Add default environment variables if nothing defined
- if len(env) == 0 {
- env = append(env, defaultEnvVariables...)
- }
- // Each environment variable must be in the K=V format
- for _, i := range env {
- spliti := strings.Split(i, "=")
- if len(spliti) != 2 {
- return env, errors.Errorf("environment variables must be in the format KEY=VALUE: %s is invalid", i)
- }
- }
- return env, nil
-}
-
func convertStringSliceToMap(strSlice []string, delimiter string) (map[string]string, error) {
sysctl := make(map[string]string)
for _, inputSysctl := range strSlice {