Merge branch 'master' of https://gitee.com/XWORK/Ui-Skote
This commit is contained in:
@@ -5,7 +5,9 @@ param (
|
||||
[string]$DockerImgName = "usvisartrack_ui",
|
||||
[string]$CodeServerPort = "8080",
|
||||
[string]$PublishServerPort = "8686",
|
||||
[string]$BuildVerison = "0.0.6",
|
||||
[string]$BuildVerison = "0.0.6
|
||||
|
||||
",
|
||||
[string]$PushServer = "repo-docker.ossez.com",
|
||||
[string]$PushPath = "/docker-hub/"
|
||||
)
|
||||
@@ -14,10 +16,13 @@ function publishDockerToRemoteServer {
|
||||
build
|
||||
|
||||
$fullImageName = BuildDockerFullImageName $DockerImgName $BuildVerison
|
||||
$fullLatestImageName = BuildDockerFullImageName $DockerImgName "latest"
|
||||
|
||||
ExecuteShellText "docker login $PushServer" "登录远程Docker仓库"
|
||||
ExecuteShellText "docker tag $fullImageName $PushServer$PushPath$fullImageName" "Docker镜像打标签"
|
||||
ExecuteShellText "docker push $PushServer$PushPath$fullImageName" "Docker镜像推送到远程服务器"
|
||||
ExecuteShellText "docker tag $fullImageName $PushServer$PushPath$fullImageName" "Docker版本镜像打标签"
|
||||
ExecuteShellText "docker tag $fullImageName $PushServer$PushPath$fullLatestImageName" "Docker Latest镜像打标签"
|
||||
ExecuteShellText "docker push $PushServer$PushPath$fullImageName" "Docker推送到远程服务器"
|
||||
ExecuteShellText "docker push $PushServer$PushPath$fullLatestImageName" "Docker推送到远程服务器"
|
||||
ExecuteShellText "docker image prune -f" "清理本地无用镜像"
|
||||
|
||||
}
|
||||
@@ -27,7 +32,7 @@ function build () {
|
||||
ExecuteShellText "yarn build" "编译项目"
|
||||
ExecuteShellText "docker image prune -f" "清理本地无用镜像"
|
||||
$fullImageName = BuildDockerFullImageName $DockerImgName $BuildVerison
|
||||
ExecuteShellText "docker build -f Dockerfile -t=""$fullImageName"" --label ""$DockerImgName"" --label ""$BuildVerison"" ." "编译镜像 $fullImageName"
|
||||
ExecuteShellText "docker build -f Dockerfile -t=""$fullImageName"" --label ""$DockerImgName"" --label ""latest"" --label ""$BuildVerison"" ." "编译镜像 $fullImageName"
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user