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

Keep the app source archive with the app instance data dir

Browse Source
This commit is contained in:
Johannes Zellner
2026-01-27 12:06:40 +01:00
parent ef2a94c2c8
commit fd0d65b8ce
4 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/docker.js
View File

@@ -160,16 +160,15 @@ async function pullImage(imageRef) {
});
}
async function buildImage(manifest) {
assert.strictEqual(typeof manifest, 'object');
async function buildImage(dockerImage, sourceArchiveFilePath) {
assert.strictEqual(typeof dockerImage, 'string');
assert.strictEqual(typeof sourceArchiveFilePath, 'string');
const sourceArchivePath = '/tmp/' + manifest.dockerImage.slice('local/'.length);
debug(`buildImage: building ${dockerImage} from ${sourceArchiveFilePath}`);
debug(`buildImage: building ${manifest.dockerImage} from ${sourceArchivePath}`);
const tarStream = fs.createReadStream(sourceArchivePath);
const [error, stream] = await safe(gConnection.buildImage(tarStream, { t: manifest.dockerImage }));
if (error) throw new BoxError(BoxError.DOCKER_ERROR, `Unable to build image from ${sourceArchivePath}: ${error.message}`);
const tarStream = fs.createReadStream(sourceArchiveFilePath);
const [error, stream] = await safe(gConnection.buildImage(tarStream, { t: dockerImage }));
if (error) throw new BoxError(BoxError.DOCKER_ERROR, `Unable to build image from ${sourceArchiveFilePath}: ${error.message}`);
return new Promise((resolve, reject) => {
let buildError = null;
@@ -190,14 +189,14 @@ async function buildImage(manifest) {
debug(`buildImage: error ${buildError}`);
return reject(new BoxError(buildError.message.includes('no space') ? BoxError.FS_ERROR : BoxError.DOCKER_ERROR, buildError.message));
} else {
debug(`buildImage: success ${manifest.dockerImage}`);
debug(`buildImage: success ${dockerImage}`);
}
resolve();
});
stream.on('error', (error) => {
debug(`buildImage: error building image ${manifest.dockerImage}: %o`, error);
debug(`buildImage: error building image ${dockerImage}: %o`, error);
reject(new BoxError(BoxError.DOCKER_ERROR, error.message));
});
});