jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix error handling of all the execSync usage

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-11-23 11:39:00 -08:00
parent a0306c69e1
commit 4142d7a050
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform.js
View File

@@ -16,7 +16,6 @@ var addons = require('./addons.js'),
async = require('async'),
config = require('./config.js'),
debug = require('debug')('box:platform'),
execSync = require('child_process').execSync,
fs = require('fs'),
graphs = require('./graphs.js'),
infra = require('./infra_version.js'),
@@ -114,7 +113,9 @@ function pruneInfraImages(callback) {
const images = infra.baseImages.concat(Object.keys(infra.images).map(function (addon) { return infra.images[addon]; }));
async.eachSeries(images, function (image, iteratorCallback) {
let output = execSync(`docker images --digests ${image.repo} --format "{{.ID}} {{.Repository}}:{{.Tag}}@{{.Digest}}"`, { encoding: 'utf8' });
let output = safe.child_process.execSync(`docker images --digests ${image.repo} --format "{{.ID}} {{.Repository}}:{{.Tag}}@{{.Digest}}"`, { encoding: 'utf8' });
if (output === null) return iteratorCallback(safe.error);
let lines = output.trim().split('\n');
for (let line of lines) {
if (!line) continue;