Commit df862410 authored by R10's avatar R10

Merge branch 'release_gdghg' of ssh://gitlab.gsstcloud.com:10022/poc/poc-api into release_gdghg

parents 0c63787f e9413e32
...@@ -62,13 +62,13 @@ curl -X POST http://$dcui_address/api/v1/projects --data \'{"id":"\'$dcui_projec ...@@ -62,13 +62,13 @@ curl -X POST http://$dcui_address/api/v1/projects --data \'{"id":"\'$dcui_projec
environment { environment {
// Docker Compose UI的地址 // Docker Compose UI的地址
dcui_address = '192.168.21.102:5000' dcui_address = '192.168.21.102:5000'
dcui_project_id = 'poc-v2' dcui_project_id = 'modellink'
// 私有仓库地址 // 私有仓库地址
registry_address = 'nexus3.gsstcloud.com:8092' registry_address = 'nexus3.gsstcloud.com:8092'
// mvn docker:build的镜像前缀 // mvn docker:build的镜像前缀
image_prefix = 'dev-localhost' image_prefix = 'dev-localhost'
docker_image_group_name = 'poc-v2' docker_image_group_name = 'modellink'
docker_image_name = 'poc-api-v2' docker_image_name = 'modellink-api'
} }
} }
...@@ -23,8 +23,8 @@ pipeline { ...@@ -23,8 +23,8 @@ pipeline {
} }
environment { environment {
registry_address = 'registry.cn-shenzhen.aliyuncs.com/gsst' registry_address = 'registry.cn-shenzhen.aliyuncs.com/gsst'
get_image_address = 'nexus3.gsstcloud.com:8092/poc-v2' get_image_address = 'nexus3.gsstcloud.com:8092/modellink'
image_name = 'poc-api-v2' image_name = 'modellink-api-prod'
} }
} }
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>cn.com.poc</groupId> <groupId>cn.com.poc</groupId>
<artifactId>poc-api-v2</artifactId> <artifactId>modellink-api</artifactId>
<packaging>war</packaging> <packaging>war</packaging>
<version>1.0.0</version> <version>1.0.0</version>
<name>poc-api-v2 Webapp</name> <name>modellink-api Webapp</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment