@lakutata/cli 1.0.22 → 1.0.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/Deploy.js +45 -39
- package/build/Deploy.js.map +1 -1
- package/package.json +3 -1
- package/src/Deploy.ts +33 -19
package/build/Deploy.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
"use strict";
|
|
3
3
|
(async () => {
|
|
4
4
|
const path = require('path');
|
|
5
|
+
const args = require('args');
|
|
5
6
|
const inquirer = require('inquirer');
|
|
6
7
|
const shelljs = require('shelljs');
|
|
7
8
|
const moment = require('moment-timezone');
|
|
@@ -12,6 +13,12 @@
|
|
|
12
13
|
const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname;
|
|
13
14
|
if (!REGISTRY_ADDR)
|
|
14
15
|
throw new Error('未配置仓库地址');
|
|
16
|
+
args
|
|
17
|
+
.option('username')
|
|
18
|
+
.option('password')
|
|
19
|
+
.option('platform')
|
|
20
|
+
.option('tagLatest');
|
|
21
|
+
const flags = args.parse(process.argv);
|
|
15
22
|
const TIMESTAMP = Date.now();
|
|
16
23
|
const IMAGE_BASE_NAME = `lakutata_tmp_image_${TIMESTAMP}`;
|
|
17
24
|
const IMAGE_VERSION = `${packageJson.version}-build.${moment().format('YYYYMMDDHHmmss')}`;
|
|
@@ -22,46 +29,45 @@
|
|
|
22
29
|
});
|
|
23
30
|
});
|
|
24
31
|
};
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const tagLatest = settings.tagLatest;
|
|
32
|
+
const platforms = [
|
|
33
|
+
'linux/amd64',
|
|
34
|
+
'linux/arm64',
|
|
35
|
+
'linux/riscv64',
|
|
36
|
+
'linux/ppc64le',
|
|
37
|
+
'linux/s390x',
|
|
38
|
+
'linux/386',
|
|
39
|
+
'linux/arm/v7',
|
|
40
|
+
'linux/arm/v6'
|
|
41
|
+
];
|
|
42
|
+
const username = flags.username ? flags.username : (await inquirer.prompt({
|
|
43
|
+
type: 'input',
|
|
44
|
+
name: 'username',
|
|
45
|
+
message: 'Docker仓库账号'
|
|
46
|
+
})).username;
|
|
47
|
+
const password = flags.password ? flags.password : (await inquirer.prompt({
|
|
48
|
+
type: 'password',
|
|
49
|
+
name: 'password',
|
|
50
|
+
message: 'Docker仓库密码',
|
|
51
|
+
mask: '*'
|
|
52
|
+
})).password;
|
|
53
|
+
const platform = flags.platform ? flags.platform : (await inquirer.prompt({
|
|
54
|
+
type: 'list',
|
|
55
|
+
name: 'platform',
|
|
56
|
+
message: '目标构建平台架构',
|
|
57
|
+
choices: platforms
|
|
58
|
+
})).platform;
|
|
59
|
+
let tagLatest = flags.tagLatest ? flags.tagLatest : (await inquirer.prompt({
|
|
60
|
+
type: 'confirm',
|
|
61
|
+
name: 'tagLatest',
|
|
62
|
+
message: '是否为镜像打上latest标签',
|
|
63
|
+
default: false
|
|
64
|
+
})).tagLatest;
|
|
65
|
+
if (typeof tagLatest === 'string') {
|
|
66
|
+
tagLatest = tagLatest !== 'false';
|
|
67
|
+
}
|
|
62
68
|
try {
|
|
63
|
-
await execPromise(`docker login --username=${
|
|
64
|
-
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${
|
|
69
|
+
await execPromise(`docker login --username=${username} ${REPOSITORY_ADDR} -p${password}`);
|
|
70
|
+
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${platform} .`);
|
|
65
71
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`);
|
|
66
72
|
if (tagLatest) {
|
|
67
73
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`);
|
package/build/Deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":";;AACA,CAAC,KAAK,IAAI,EAAE;IACR,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IACpC,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;IAClC,MAAM,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACzC,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAA;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;IACnC,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IAC/C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAA;IACjD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,UAAU,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAA;IACnE,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAA;IAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC5B,MAAM,eAAe,GAAG,sBAAsB,SAAS,EAAE,CAAA;IACzD,MAAM,aAAa,GAAG,GAAG,WAAW,CAAC,OAAO,UAAU,MAAM,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAA;IACzF,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,OAAQ,EAAE,EAAE;QACtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBACpD,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACrD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;IACN,CAAC,CAAA;IACD,MAAM,
|
|
1
|
+
{"version":3,"file":"Deploy.js","sourceRoot":"","sources":["../src/Deploy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lakutata/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.23",
|
|
4
4
|
"description": "Lakutata CLI Tool",
|
|
5
5
|
"main": "./build/CLI.js",
|
|
6
6
|
"types": "./build/CLI.d.ts",
|
|
@@ -35,6 +35,8 @@
|
|
|
35
35
|
"author": "alex.ma",
|
|
36
36
|
"license": "MIT",
|
|
37
37
|
"dependencies": {
|
|
38
|
+
"@types/args": "^5.0.0",
|
|
39
|
+
"args": "^5.0.3",
|
|
38
40
|
"inquirer": "^8.2.4",
|
|
39
41
|
"moment-timezone": "^0.5.34",
|
|
40
42
|
"package-json": "^7.0.0",
|
package/src/Deploy.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
(async () => {
|
|
3
3
|
const path = require('path')
|
|
4
|
+
const args = require('args')
|
|
4
5
|
const inquirer = require('inquirer')
|
|
5
6
|
const shelljs = require('shelljs')
|
|
6
7
|
const moment = require('moment-timezone')
|
|
@@ -10,6 +11,12 @@
|
|
|
10
11
|
const DOCKERFILE_PATH = process.argv[argvLen - 2]
|
|
11
12
|
const REPOSITORY_ADDR = new URL(`repo://${REGISTRY_ADDR}`).hostname
|
|
12
13
|
if (!REGISTRY_ADDR) throw new Error('未配置仓库地址')
|
|
14
|
+
args
|
|
15
|
+
.option('username')
|
|
16
|
+
.option('password')
|
|
17
|
+
.option('platform')
|
|
18
|
+
.option('tagLatest')
|
|
19
|
+
const flags = args.parse(process.argv)
|
|
13
20
|
const TIMESTAMP = Date.now()
|
|
14
21
|
const IMAGE_BASE_NAME = `lakutata_tmp_image_${TIMESTAMP}`
|
|
15
22
|
const IMAGE_VERSION = `${packageJson.version}-build.${moment().format('YYYYMMDDHHmmss')}`
|
|
@@ -20,46 +27,53 @@
|
|
|
20
27
|
})
|
|
21
28
|
})
|
|
22
29
|
}
|
|
23
|
-
const
|
|
30
|
+
const platforms = [
|
|
31
|
+
'linux/amd64',
|
|
32
|
+
'linux/arm64',
|
|
33
|
+
'linux/riscv64',
|
|
34
|
+
'linux/ppc64le',
|
|
35
|
+
'linux/s390x',
|
|
36
|
+
'linux/386',
|
|
37
|
+
'linux/arm/v7',
|
|
38
|
+
'linux/arm/v6'
|
|
39
|
+
]
|
|
40
|
+
const username = flags.username ? flags.username : (await inquirer.prompt(
|
|
24
41
|
{
|
|
25
42
|
type: 'input',
|
|
26
43
|
name: 'username',
|
|
27
44
|
message: 'Docker仓库账号'
|
|
28
|
-
}
|
|
45
|
+
}
|
|
46
|
+
)).username
|
|
47
|
+
const password = flags.password ? flags.password : (await inquirer.prompt(
|
|
29
48
|
{
|
|
30
49
|
type: 'password',
|
|
31
50
|
name: 'password',
|
|
32
51
|
message: 'Docker仓库密码',
|
|
33
52
|
mask: '*'
|
|
34
53
|
}
|
|
35
|
-
|
|
36
|
-
const
|
|
54
|
+
)).password
|
|
55
|
+
const platform = flags.platform ? flags.platform : (await inquirer.prompt(
|
|
37
56
|
{
|
|
38
57
|
type: 'list',
|
|
39
58
|
name: 'platform',
|
|
40
59
|
message: '目标构建平台架构',
|
|
41
|
-
choices:
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
'linux/ppc64le',
|
|
46
|
-
'linux/s390x',
|
|
47
|
-
'linux/386',
|
|
48
|
-
'linux/arm/v7',
|
|
49
|
-
'linux/arm/v6'
|
|
50
|
-
]
|
|
51
|
-
},
|
|
60
|
+
choices: platforms
|
|
61
|
+
}
|
|
62
|
+
)).platform
|
|
63
|
+
let tagLatest = flags.tagLatest ? flags.tagLatest : (await inquirer.prompt(
|
|
52
64
|
{
|
|
53
65
|
type: 'confirm',
|
|
54
66
|
name: 'tagLatest',
|
|
55
67
|
message: '是否为镜像打上latest标签',
|
|
56
68
|
default: false
|
|
57
69
|
}
|
|
58
|
-
|
|
59
|
-
|
|
70
|
+
)).tagLatest
|
|
71
|
+
if (typeof tagLatest === 'string') {
|
|
72
|
+
tagLatest = tagLatest !== 'false'
|
|
73
|
+
}
|
|
60
74
|
try {
|
|
61
|
-
await execPromise(`docker login --username=${
|
|
62
|
-
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${
|
|
75
|
+
await execPromise(`docker login --username=${username} ${REPOSITORY_ADDR} -p${password}`)
|
|
76
|
+
shelljs.exec(`docker buildx build -f ${DOCKERFILE_PATH} -t ${IMAGE_BASE_NAME}:${IMAGE_VERSION} --platform=${platform} .`)
|
|
63
77
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:${IMAGE_VERSION}`)
|
|
64
78
|
if (tagLatest) {
|
|
65
79
|
shelljs.exec(`docker tag ${IMAGE_BASE_NAME}:${IMAGE_VERSION} ${REGISTRY_ADDR}:latest`)
|