diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-10 19:38:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-10 19:38:49 +0100 |
| commit | 2343161593dc5c2a869849a37e08f84468a6bca9 (patch) | |
| tree | 3c7fe9a68d5f8d3c48c73fc6e89c64bd04a3f15a /test/e2e/libpod_suite_remote_test.go | |
| parent | 786757fb01208cf72e1c67611acbab1411746036 (diff) | |
| parent | c9ef2607104a0b17e5146b3ee01852edb7d3d688 (diff) | |
| download | podman-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 '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) |