self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

Tools: Moved some utility functions to @joplin/utils to reduce dependencies between packages

Browse Source
This commit is contained in:
Laurent Cozic
2023-03-19 15:37:07 +00:00
parent 1548ea18e1
commit 3e52411bc4
37 changed files with 308 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/tools/buildServerDocker.ts
View File

@@ -1,5 +1,6 @@
import { execCommand2, rootDir } from './tool-utils';
import { rootDir } from './tool-utils';
import * as moment from 'moment';
import { execCommand } from '@joplin/utils';
interface Argv {
dryRun?: boolean;
@@ -35,7 +36,7 @@ async function main() {
const buildDate = moment(new Date().getTime()).format('YYYY-MM-DDTHH:mm:ssZ');
let revision = '';
try {
revision = await execCommand2('git rev-parse --short HEAD', { showStdout: false });
revision = await execCommand('git rev-parse --short HEAD', { showStdout: false });
} catch (error) {
console.info('Could not get git commit: metadata revision field will be empty');
}
@@ -62,11 +63,11 @@ async function main() {
return;
}
await execCommand2(dockerCommand);
await execCommand(dockerCommand);
for (const tag of dockerTags) {
await execCommand2(`docker tag "${repository}:${imageVersion}" "${repository}:${tag}"`);
if (pushImages) await execCommand2(`docker push ${repository}:${tag}`);
await execCommand(`docker tag "${repository}:${imageVersion}" "${repository}:${tag}"`);
if (pushImages) await execCommand(`docker push ${repository}:${tag}`);
}
}