Browse Source

@IPU_REQ_2021@将dockerfile的缺省目录设置上移到parent pom中

weihf 3 years ago
parent
commit
db628a9454
2 changed files with 13 additions and 16 deletions
  1. 3 6
      ipu-rest-demo/pom.xml
  2. 10 10
      ipu-rest-scaffold/pom.xml

+ 3 - 6
ipu-rest-demo/pom.xml

26
    </distributionManagement>
26
    </distributionManagement>
27
    
27
    
28
	<properties>
28
	<properties>
29
        <dockerDirectory>${project.basedir}/docker</dockerDirectory>
30
        <!-- 设置配置文件输出目录 -->
31
        <output-resources-conf>${dockerDirectory}/target/conf</output-resources-conf>
32
        <!-- 设置依赖jar输出目录 -->
33
        <output-dependency-jar>${dockerDirectory}/target/lib</output-dependency-jar>
29
        <!-- 如果不使用docker打包功能,请设置dockerDirectory为${basedir} -->
30
        <!-- <dockerDirectory>${basedir}</dockerDirectory> -->
34
31
35
		<env>dev</env>
32
		<env>dev</env>
36
		<skip-test>true</skip-test>
33
		<skip-test>true</skip-test>
37
		<start-class>com.ai.ipu.server.demo.IpuRestDemoStart</start-class>
34
		<start-class>com.ai.ipu.server.demo.IpuRestDemoStart</start-class>
38
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39
		<ipu>3.2-SNAPSHOT</ipu>
36
		<ipu>3.2-SNAPSHOT</ipu>
37
		<!-- ipu-dependencies3.3-SNAPSHOT起,不再支持springboot1.x,升级为springboot2.1.3-RELEASE -->
40
		<ipu-rest>3.3-SNAPSHOT</ipu-rest>
38
		<ipu-rest>3.3-SNAPSHOT</ipu-rest>
41
		<org.springframework.boot>2.1.3.RELEASE</org.springframework.boot>
39
		<org.springframework.boot>2.1.3.RELEASE</org.springframework.boot>
42
		<!-- 执行完build镜像后,是否自动push到仓库,如果是,必须配置docker-registry-server -->
40
		<!-- 执行完build镜像后,是否自动push到仓库,如果是,必须配置docker-registry-server -->
43
		<spring-boot-docker-push>false</spring-boot-docker-push>
41
		<spring-boot-docker-push>false</spring-boot-docker-push>
44
        <!-- 拉取镜像的策略,可选的值:ALWAYS, NEVER, IF_NOT_PRESENT -->
42
        <!-- 拉取镜像的策略,可选的值:ALWAYS, NEVER, IF_NOT_PRESENT -->
45
        <spring-boot-docker-base-img-pull-policy>IF_NOT_PRESENT</spring-boot-docker-base-img-pull-policy>
43
        <spring-boot-docker-base-img-pull-policy>IF_NOT_PRESENT</spring-boot-docker-base-img-pull-policy>
46
        
47
44
48
		<!-- docker私人仓库服务器及端口或者docker公共仓库用户名,无仓库则为镜像前缀 -->
45
		<!-- docker私人仓库服务器及端口或者docker公共仓库用户名,无仓库则为镜像前缀 -->
49
		<!-- ipudocker.com对应公网阿里云私库47.105.130.83或公司内网亚信云私库10.19.14.114  --> 
46
		<!-- ipudocker.com对应公网阿里云私库47.105.130.83或公司内网亚信云私库10.19.14.114  --> 

+ 10 - 10
ipu-rest-scaffold/pom.xml

6
	<parent>
6
	<parent>
7
		<groupId>com.ai.ipu.server</groupId>
7
		<groupId>com.ai.ipu.server</groupId>
8
		<artifactId>ipu-assembly-parent</artifactId>
8
		<artifactId>ipu-assembly-parent</artifactId>
9
		<version>3.2-SNAPSHOT</version>
9
		<version>3.3-SNAPSHOT</version>
10
	</parent>
10
	</parent>
11
11
12
	<artifactId>ipu-rest-scaffold</artifactId>
12
	<artifactId>ipu-rest-scaffold</artifactId>
43
	</repositories>
43
	</repositories>
44
44
45
	<properties>
45
	<properties>
46
        <!-- 设置配置文件输出目录 -->
47
        <output-resources-conf>${project.basedir}/docker/target/conf</output-resources-conf>
48
        <!-- 设置依赖jar输出目录 -->
49
        <output-dependency-jar>${project.basedir}/docker/target/lib</output-dependency-jar>
50
        <dockerDirectory>${project.basedir}/docker</dockerDirectory>
46
	    <!-- 如果不使用docker打包功能,请设置dockerDirectory为${basedir} -->
47
        <!-- <dockerDirectory>${basedir}</dockerDirectory> -->
51
		<env>dev</env>
48
		<env>dev</env>
52
		<start-class>com.ai.ipu.server.RestScaffoldStart</start-class>
49
		<start-class>com.ai.ipu.server.RestScaffoldStart</start-class>
53
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
50
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54
		<ipu>3.2-SNAPSHOT</ipu>
51
		<ipu>3.2-SNAPSHOT</ipu>
52
		<!-- ipu-dependencies3.3-SNAPSHOT起,不再支持springboot1.x,升级为springboot2.1.3-RELEASE -->
55
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
53
		<ipu-rest>3.2-SNAPSHOT</ipu-rest>
56
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
54
		<org.springframework.boot>1.5.9.RELEASE</org.springframework.boot>
57
55
58
		<!-- docker仓库服务器及端口,如果只是docker容器,则为镜像前缀 -->
56
		<!-- docker仓库服务器及端口,如果只是docker容器,则为镜像前缀 -->
59
		<!-- ipudocker.com对应47.105.130.83 -->
57
		<!-- ipudocker.com对应公网阿里云私库47.105.130.83或公司内网亚信云私库10.19.14.114  -->
60
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
58
		<docker-registry-server>ipudocker.com:5000</docker-registry-server>
61
		<!-- docker仓库身份认证方式及用户密码,如果只是docker容器,请设置为空 -->
59
		<!-- docker仓库身份认证方式及用户密码,如果只是docker容器,请设置为空
60
		由于3.3-SNAPSHOT的parent pom里已经缺省设置好了阿里云和亚信云私人仓库的用户、密码,因此这里不再需要定义
61
		如果是自己安装的私人仓库,且用户、密码不同,则必须打开注释,定义自己的仓库用户、密码。
62
		<docker-registry-auth>basic</docker-registry-auth>
62
		<docker-registry-auth>basic</docker-registry-auth>
63
		<docker-registry-username>ipu</docker-registry-username>
63
		<docker-registry-username>ipu</docker-registry-username>
64
		<docker-registry-password>ipuDocker@83</docker-registry-password>
64
		<docker-registry-password>ipuDocker@83</docker-registry-password> -->
65
	</properties>
65
	</properties>
66
66
67
	<dependencyManagement>
67
	<dependencyManagement>
122
	</dependencies>
122
	</dependencies>
123
123
124
	<build>
124
	<build>
125
        <directory>${project.basedir}/docker/target</directory>
125
        <!-- <directory>${project.basedir}/docker/target</directory> -->
126
		<plugins>
126
		<plugins>
127
			<!-- ==========应用包和依赖包分离的打包方法================ -->
127
			<!-- ==========应用包和依赖包分离的打包方法================ -->
128
			<plugin>
128
			<plugin>