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 /test/e2e/libpod_suite_remote_test.go | |
| 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 'test/e2e/libpod_suite_remote_test.go')
| -rw-r--r-- | test/e2e/libpod_suite_remote_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index a26765ee9..3115c246f 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -48,17 +48,17 @@ func (p *PodmanTestIntegration) PodmanExtraFiles(args []string, extraFiles []*os func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() { defaultFile := filepath.Join(INTEGRATION_ROOT, "test/registries.conf") - os.Setenv("REGISTRIES_CONFIG_PATH", defaultFile) + os.Setenv("CONTAINERS_REGISTRIES_CONF", defaultFile) } func (p *PodmanTestIntegration) setRegistriesConfigEnv(b []byte) { outfile := filepath.Join(p.TempDir, "registries.conf") - os.Setenv("REGISTRIES_CONFIG_PATH", outfile) + os.Setenv("CONTAINERS_REGISTRIES_CONF", outfile) ioutil.WriteFile(outfile, b, 0644) } func resetRegistriesConfigEnv() { - os.Setenv("REGISTRIES_CONFIG_PATH", "") + os.Setenv("CONTAINERS_REGISTRIES_CONF", "") } func PodmanTestCreate(tempDir string) *PodmanTestIntegration { pti := PodmanTestCreateUtil(tempDir, true) |