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

add debug output to mergeExistingDockerAuthJson

Browse Source
This commit is contained in:
David Hiendl 2023-12-28 20:33:45 +01:00
parent 7650773bc5
commit 4e0794511b
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/index.js vendored
View File

@ -62169,10 +62169,12 @@ 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`);
return;
}
@ -62180,13 +62182,18 @@ function mergeExistingDockerAuthJson(registryAuthJson, targetFile) {
const existingJsonStr = external_fs_.readFileSync(targetFile, {encoding: 'utf-8'});
const existingJson = JSON.parse(existingJsonStr);
if (existingJson.auths != null && typeof existingJson === 'object') {
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`);
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}"`);
@ -62478,7 +62485,6 @@ try {
console.log('determined .docker/config.json location: ', dockerConfigFile);
}
const registryAuthJson = {auths: {}};
mergeExistingDockerAuthJson(registryAuthJson);
addCiRegistryAuth(ci_registry, registryAuthJson);

9
src/lib.js
View File

@ -62,10 +62,12 @@ 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`);
return;
}
@ -73,13 +75,18 @@ export function mergeExistingDockerAuthJson(registryAuthJson, targetFile) {
const existingJsonStr = fs.readFileSync(targetFile, {encoding: 'utf-8'});
const existingJson = JSON.parse(existingJsonStr);
if (existingJson.auths != null && typeof existingJson === 'object') {
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`);
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}"`);