summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-10 19:38:49 +0100
committerGitHub <noreply@github.com>2021-03-10 19:38:49 +0100
commit2343161593dc5c2a869849a37e08f84468a6bca9 (patch)
tree3c7fe9a68d5f8d3c48c73fc6e89c64bd04a3f15a /libpod
parent786757fb01208cf72e1c67611acbab1411746036 (diff)
parentc9ef2607104a0b17e5146b3ee01852edb7d3d688 (diff)
downloadpodman-2343161593dc5c2a869849a37e08f84468a6bca9.tar.gz
podman-2343161593dc5c2a869849a37e08f84468a6bca9.tar.bz2
podman-2343161593dc5c2a869849a37e08f84468a6bca9.zip
Merge pull request #9668 from rhatdan/man
Document CONTAINERS_CONF/CONTAINERS_STORAGE_CONF Env variables
Diffstat (limited to 'libpod')
-rw-r--r--libpod/runtime_img_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime_img_test.go b/libpod/runtime_img_test.go
index 7d6390c85..c25f3f08c 100644
--- a/libpod/runtime_img_test.go
+++ b/libpod/runtime_img_test.go
@@ -37,7 +37,7 @@ func TestGetRegistries(t *testing.T) {
registryPath, err := createTmpFile([]byte(registry))
assert.NoError(t, err)
defer os.Remove(registryPath)
- os.Setenv("REGISTRIES_CONFIG_PATH", registryPath)
+ os.Setenv("CONTAINERS_REGISTRIES_CONF", registryPath)
registries, err := sysreg.GetRegistries()
assert.NoError(t, err)
assert.True(t, reflect.DeepEqual(registries, []string{"one"}))
@@ -46,7 +46,7 @@ func TestGetRegistries(t *testing.T) {
func TestGetInsecureRegistries(t *testing.T) {
registryPath, err := createTmpFile([]byte(registry))
assert.NoError(t, err)
- os.Setenv("REGISTRIES_CONFIG_PATH", registryPath)
+ os.Setenv("CONTAINERS_REGISTRIES_CONF", registryPath)
defer os.Remove(registryPath)
registries, err := sysreg.GetInsecureRegistries()
assert.NoError(t, err)