Merge pull request #513 from atiratree/prefer-podman-auth

prefer podman authentication file locations
openshift · Mar 31, 2023 · b2aa20f · b2aa20f
2 parents 5074722 + 1b12a19
commit b2aa20f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cmd/release-controller/sync_release.go b/cmd/release-controller/sync_release.go
@@ -282,12 +282,14 @@ func newReleaseJobBase(name, cliImage, pullSecretName string) (*batchv1.Job, str
 		prefix = `
 			set -eu
 			mkdir $HOME/.docker/
+			mkdir -p "${XDG_RUNTIME_DIR}"
 			cp -Lf /tmp/pull-secret/* $HOME/.docker/
-			oc registry login
+			oc registry login --to $HOME/.docker/config.json
 			`
 	} else {
 		prefix = `
 			set -eu
+			mkdir -p "${XDG_RUNTIME_DIR}"
 			oc registry login
 			`
 	}
@@ -312,6 +314,7 @@ func newReleaseJobBase(name, cliImage, pullSecretName string) (*batchv1.Job, str
 
 							Env: []corev1.EnvVar{
 								{Name: "HOME", Value: "/tmp"},
+								{Name: "XDG_RUNTIME_DIR", Value: "/tmp/run"},
 							},
 							TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 						},

diff --git a/pkg/release-controller/release_info.go b/pkg/release-controller/release_info.go
@@ -832,6 +832,7 @@ func (r *ExecReleaseInfo) specHash(image string) appsv1.StatefulSetSpec {
 						Image: image,
 						Env: []corev1.EnvVar{
 							{Name: "HOME", Value: "/tmp"},
+							{Name: "XDG_RUNTIME_DIR", Value: "/tmp/run"},
 							{Name: "GIT_COMMITTER_NAME", Value: "test"},
 							{Name: "GIT_COMMITTER_EMAIL", Value: "test@test.com"},
 						},
@@ -853,13 +854,13 @@ func (r *ExecReleaseInfo) specHash(image string) appsv1.StatefulSetSpec {
 							trap 'kill $(jobs -p); exit 0' TERM
 
 							# ensure we are logged in to our registry
-							mkdir -p /tmp/.docker/
+							mkdir -p /tmp/.docker/ "${XDG_RUNTIME_DIR}"
 							cp /tmp/pull-secret/* /tmp/.docker/ || true
 
 							git config --global credential.helper store
 							git config --global user.name test
 							git config --global user.email test@test.com
-							oc registry login
+							oc registry login --to /tmp/.docker/config.json
 							while true; do
 							  sleep 180 & wait
 							done
@@ -991,6 +992,7 @@ func (r *ExecReleaseFiles) specHash(image string) appsv1.StatefulSetSpec {
 						WorkingDir: "/srv/cache",
 						Env: []corev1.EnvVar{
 							{Name: "HOME", Value: "/tmp"},
+							{Name: "XDG_RUNTIME_DIR", Value: "/tmp/run"},
 							{Name: "RELEASE_NAMESPACE", Value: r.releaseNamespace},
 							{Name: "REGISTRY", Value: r.registry},
 						},
@@ -1014,9 +1016,9 @@ set -euo pipefail
 trap 'kill $(jobs -p); exit 0' TERM
 
 # ensure we are logged in to our registry
-mkdir -p /tmp/.docker/
+mkdir -p /tmp/.docker/ "${XDG_RUNTIME_DIR}"
 cp /tmp/pull-secret/* /tmp/.docker/ || true
-oc registry login
+oc registry login --to /tmp/.docker/config.json
 
 if which python3 2> /dev/null; then
   # If python3 is available, use it