@@ -2,13 +2,22 @@ import { execCommand } from './exec'
2
2
import { VipLogger } from './logger'
3
3
import { vipSymbols } from './color'
4
4
5
+ const vipLog = new VipLogger ( )
6
+
7
+ /**
8
+ * 142vip 仓库地址
9
+ * - 格式:`${VipDockerAddress}/项目代号:${pkg.name}-${pkg.version}`
10
+ * - 例如:registry.cn-hangzhou.aliyuncs.com/142vip/docs:JavaScriptCollection-0.0.1
11
+ */
12
+ export const VipDockerAddress : string = 'registry.cn-hangzhou.aliyuncs.com/142vip'
13
+
5
14
interface DockerOptions {
6
15
logger ?: boolean
7
16
}
8
17
9
- interface BuildImageDockerOptions {
18
+ interface BuildImageDockerOptions extends DockerOptions {
10
19
imageName : string
11
- buildArgs ?: [ string , string ] [ ]
20
+ buildArgs ?: [ string , number | boolean | string ] [ ]
12
21
}
13
22
14
23
/**
@@ -85,7 +94,6 @@ export async function isInstallDockerCompose(args?: DockerOptions) {
85
94
86
95
// 打印日志
87
96
if ( args ?. logger ) {
88
- const vipLog = new VipLogger ( )
89
97
if ( code === 0 ) {
90
98
vipLog . log ( `检测到docker-compose,版本信息:\n` , { startLabel : vipSymbols . success } )
91
99
vipLog . log ( stdout )
@@ -115,9 +123,12 @@ export async function buildImage(args: BuildImageDockerOptions) {
115
123
// 构建参数
116
124
let buildArg = ''
117
125
if ( args . buildArgs != null ) {
118
- buildArg = args . buildArgs . map ( arg => `--build-arg ${ arg [ 0 ] } =${ arg [ 1 ] } ` ) . join ( ' ' )
126
+ buildArg = args . buildArgs . map ( arg => `--build-arg ${ arg [ 0 ] } =' ${ arg [ 1 ] } ' ` ) . join ( ' ' )
119
127
}
120
128
const command = `docker build ${ buildArg } -t ${ args . imageName } .`
121
- console . log ( 111 , command )
129
+ if ( args . logger ) {
130
+ vipLog . log ( `执行的命令:\n` , { startLabel : vipSymbols . success } )
131
+ vipLog . log ( command )
132
+ }
122
133
return await execCommand ( command )
123
134
}
0 commit comments