actions/docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix additional registry auth not being nested correctly under 'auths' key

Browse Source
This commit is contained in:
David Hiendl
2023-12-06 12:39:50 +01:00
parent 2db35341c0
commit 6ccd719229
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/index.js
Vendored
+2 -2
View File
@@ -62144,14 +62144,14 @@ function addCiRegistryAuth(ci_registry, registryAuthJson) {
} }
function mergeArgRegistryAuthJson(registryAuthJson) { function mergeArgRegistryAuthJson(registryAuthJson) {
const argRegistryAuthJson = core.getInput("registry_auth_json"); const argRegistryAuthJson = core.getInput('registry_auth_json');
if (argRegistryAuthJson != null && argRegistryAuthJson.trim().length > 0) { if (argRegistryAuthJson != null && argRegistryAuthJson.trim().length > 0) {
try { try {
const argRegistryAuth = JSON.parse(argRegistryAuthJson); const argRegistryAuth = JSON.parse(argRegistryAuthJson);
if (argRegistryAuth.auths != null) { if (argRegistryAuth.auths != null) {
for (const key in argRegistryAuth.auths) { for (const key in argRegistryAuth.auths) {
if (argRegistryAuth.auths.hasOwnProperty(key)) { if (argRegistryAuth.auths.hasOwnProperty(key)) {
registryAuthJson[key] = argRegistryAuth.auths[key]; registryAuthJson.auths[key] = argRegistryAuth.auths[key];
} }
} }
} }
src/lib.js
+1 -1
View File
@@ -47,7 +47,7 @@ export function mergeArgRegistryAuthJson(registryAuthJson) {
if (argRegistryAuth.auths != null) { if (argRegistryAuth.auths != null) {
for (const key in argRegistryAuth.auths) { for (const key in argRegistryAuth.auths) {
if (argRegistryAuth.auths.hasOwnProperty(key)) { if (argRegistryAuth.auths.hasOwnProperty(key)) {
registryAuthJson[key] = argRegistryAuth.auths[key]; registryAuthJson.auths[key] = argRegistryAuth.auths[key];
} }
} }
} }