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

cleanup debug output

Browse Source
This commit is contained in:
David Hiendl 2023-12-28 20:37:16 +01:00
parent 5399a159dd
commit 7b19d1b0f6
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/index.js vendored
View File

@ -62169,12 +62169,11 @@ function mergeArgRegistryAuthJson(registryAuthJson) {
function mergeExistingDockerAuthJson(registryAuthJson, targetFile) {
if (!core.getBooleanInput('merge_existing_auth_json')) {
console.log('merge_existing_auth_json is disabled');
return;
}
if (!external_fs_.existsSync(targetFile)) {
console.log(`${targetFile} does not exist`);
console.log(`no pre-existing config found, skipping merge: ${targetFile}`);
return;
}
@ -62184,16 +62183,12 @@ function mergeExistingDockerAuthJson(registryAuthJson, targetFile) {
if (existingJson.auths != null && typeof existingJson.auths === 'object') {
for (const key in existingJson.auths) {
console.log(`existingJson.auths.${key}`);
if (existingJson.auths.hasOwnProperty(key)) {
console.log(`existingJson.auths.${key} has own property, assigning value`);
console.log(`merging existingJson.auths[${key}]`);
registryAuthJson.auths[key] = existingJson.auths[key];
}
}
}
else {
console.log('existingJson.auths is ' + typeof existingJson.auths);
}
}
catch (e) {
console.log(`Failed to parse existing docker auth json in file: ${targetFile}"`);

9
src/lib.js
View File

@ -62,12 +62,11 @@ export function mergeArgRegistryAuthJson(registryAuthJson) {
export function mergeExistingDockerAuthJson(registryAuthJson, targetFile) {
if (!core.getBooleanInput('merge_existing_auth_json')) {
console.log('merge_existing_auth_json is disabled');
return;
}
if (!fs.existsSync(targetFile)) {
console.log(`${targetFile} does not exist`);
console.log(`no pre-existing config found, skipping merge: ${targetFile}`);
return;
}
@ -77,16 +76,12 @@ export function mergeExistingDockerAuthJson(registryAuthJson, targetFile) {
if (existingJson.auths != null && typeof existingJson.auths === 'object') {
for (const key in existingJson.auths) {
console.log(`existingJson.auths.${key}`);
if (existingJson.auths.hasOwnProperty(key)) {
console.log(`existingJson.auths.${key} has own property, assigning value`);
console.log(`merging existingJson.auths[${key}]`);
registryAuthJson.auths[key] = existingJson.auths[key];
}
}
}
else {
console.log('existingJson.auths is ' + typeof existingJson.auths);
}
}
catch (e) {
console.log(`Failed to parse existing docker auth json in file: ${targetFile}"`);