diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-08 16:04:20 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-10 06:34:47 -0500 |
| commit | c9ef2607104a0b17e5146b3ee01852edb7d3d688 (patch) | |
| tree | 242c642f1495c16038bf4145d583fa67f0e27d0e /libpod | |
| parent | 5331096b3882cd5c8e587200560e44ef1eb990a3 (diff) | |
| download | podman-c9ef2607104a0b17e5146b3ee01852edb7d3d688.tar.gz podman-c9ef2607104a0b17e5146b3ee01852edb7d3d688.tar.bz2 podman-c9ef2607104a0b17e5146b3ee01852edb7d3d688.zip | |
Document CONTAINERS_CONF/CONTAINERS_STORAGE_CONF Env variables
Also Switch to using CONTAINERS_REGISTRIES_CONF for registries.conf
overrides.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime_img_test.go | 4 |
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) |