MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc fixes

This commit is contained in:
Radon Rosborough 2021-03-27 16:16:25 -07:00
parent d5c9e97e10
commit 0e5fd407b9
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/depgraph.js
View File

@ -130,7 +130,11 @@ async function getImageArtifact({ tag, isBaseImage, isLangImage }) {
return await hashDockerfile(name, dependentDockerHashes, { salt }); return await hashDockerfile(name, dependentDockerHashes, { salt });
}, },
buildLocally: async () => { buildLocally: async () => {
await runCommand(`make image I=${tag}`); if (isLangImage) {
await runCommand(`make image I=${name} L=${isLangImage.lang}`);
} else {
await runCommand(`make image I=${name}`);
}
}, },
retrieveFromRegistry: async () => { retrieveFromRegistry: async () => {
await runCommand(`make pull I=${tag}`); await runCommand(`make pull I=${tag}`);
@ -563,15 +567,19 @@ async function executeDepGraph({
.join(", ") .join(", ")
); );
console.log(); console.log();
console.log("Do you want to perform these actions?"); if (yes) {
console.log(" Depgraph will perform the actions described above."); console.log("Skipping confirmation since --yes was passed.");
console.log(" Only 'yes' will be accepted to approve."); } else {
console.log(); console.log("Do you want to perform these actions?");
const resp = await getUserInput(" Enter a value: "); console.log(" Depgraph will perform the actions described above.");
if (resp !== "yes") { console.log(" Only 'yes' will be accepted to approve.");
console.log(); console.log();
console.log("Apply cancelled."); const resp = await getUserInput(" Enter a value: ");
process.exit(1); if (resp !== "yes") {
console.log();
console.log("Apply cancelled.");
process.exit(1);
}
} }
for (let idx = 0; idx < plan.length; idx++) { for (let idx = 0; idx < plan.length; idx++) {
const { artifact, action } = plan[idx]; const { artifact, action } = plan[idx];