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 /hack | |
| 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 'hack')
| -rwxr-xr-x | hack/podman-socat | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hack/podman-socat b/hack/podman-socat index 7bc571816..6ee6b89d8 100755 --- a/hack/podman-socat +++ b/hack/podman-socat @@ -54,8 +54,8 @@ trap "cleanup $TMPDIR" EXIT # Need locations to store stuff mkdir -p "${TMPDIR}"/{podman,crio,crio-run,cni/net.d,ctnr,tunnel} -export REGISTRIES_CONFIG_PATH=${TMPDIR}/registry.conf -cat >"$REGISTRIES_CONFIG_PATH" <<-EOT +export CONTAINERS_REGISTRIES_CONF=${TMPDIR}/registry.conf +cat >"$CONTAINERS_REGISTRIES_CONF" <<-EOT [registries.search] registries = ['docker.io'] [registries.insecure] |