Skip to content

Commit 8ecd17b

Browse files
committed
feat(@142vip/utils): 优化buildImage方法,支持Docker地址导出
1 parent 5ae56f6 commit 8ecd17b

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

packages/utils/src/docker.ts

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,22 @@ import { execCommand } from './exec'
22
import { VipLogger } from './logger'
33
import { vipSymbols } from './color'
44

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+
514
interface DockerOptions {
615
logger?: boolean
716
}
817

9-
interface BuildImageDockerOptions {
18+
interface BuildImageDockerOptions extends DockerOptions {
1019
imageName: string
11-
buildArgs?: [string, string][]
20+
buildArgs?: [string, number | boolean | string][]
1221
}
1322

1423
/**
@@ -85,7 +94,6 @@ export async function isInstallDockerCompose(args?: DockerOptions) {
8594

8695
// 打印日志
8796
if (args?.logger) {
88-
const vipLog = new VipLogger()
8997
if (code === 0) {
9098
vipLog.log(`检测到docker-compose,版本信息:\n`, { startLabel: vipSymbols.success })
9199
vipLog.log(stdout)
@@ -115,9 +123,12 @@ export async function buildImage(args: BuildImageDockerOptions) {
115123
// 构建参数
116124
let buildArg = ''
117125
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(' ')
119127
}
120128
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+
}
122133
return await execCommand(command)
123134
}

0 commit comments

Comments
 (0)