Merge https://gitee.com/gi2/pig into dev

2024-12-22 12:48:58 +08:00 · 2020-01-17 20:50:49 +08:00 · 2020-01-17 20:50:49 +08:00 · 35d7908547
commit 35d7908547
parent 72151834c2 318dc7cf2e
15 changed files with 68 additions and 23 deletions
--- a/db/Dockerfile
+++ b/db/Dockerfile
@ -4,6 +4,6 @@ MAINTAINER lengleng(wangiegie@gmail.com)

 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

-COPY ./db/pig.sql /docker-entrypoint-initdb.d
+COPY ./pig.sql /docker-entrypoint-initdb.d

-COPY ./db/pig_config.sql /docker-entrypoint-initdb.d
+COPY ./pig_config.sql /docker-entrypoint-initdb.d
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -2,8 +2,7 @@ version: '2'
 services:
  pig-mysql:
    build:
-      context: ./
-      dockerfile: ./db/Dockerfile
+      context: ./db
    environment:
      MYSQL_ROOT_PASSWORD: root
    restart: always
@ -22,8 +21,7 @@ services:

  pig-register:
    build:
-      context: ./
-      dockerfile: ./pig-register/Dockerfile
+      context: ./pig-register
    restart: always
    ports:
      - 8848:8848
@ -33,8 +31,7 @@ services:

  pig-gateway:
    build:
-      context: ./
-      dockerfile: ./pig-gateway/Dockerfile
+      context: ./pig-gateway
    restart: always
    ports:
      - 9999:9999
@ -44,8 +41,7 @@ services:

  pig-auth:
    build:
-      context: ./
-      dockerfile: ./pig-auth/Dockerfile
+      context: ./pig-auth
    restart: always
    container_name: pig-auth
    hostname: pig-auth
@ -53,8 +49,7 @@ services:

  pig-upms:
    build:
-      context: ./
-      dockerfile: ./pig-upms/pig-upms-biz/Dockerfile
+      context: ./pig-upms/pig-upms-biz
    restart: always
    container_name: pig-upms
    hostname: pig-upms
@ -62,8 +57,7 @@ services:

  pig-monitor:
    build:
-      context: ./
-      dockerfile: ./pig-monitor/Dockerfile
+      context: ./pig-monitor
    restart: always
    ports:
      - 5001:5001
@ -73,8 +67,7 @@ services:

  pig-codegen:
    build:
-      context: ./
-      dockerfile: ./pig-codegen/Dockerfile
+      context: ./pig-codegen
    restart: always
    container_name: pig-codegen
    hostname: pig-codegen
--- a/pig-auth/Dockerfile
+++ b/pig-auth/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /pig-auth

 EXPOSE 3000

-ADD ./pig-auth/target/pig-auth.jar ./
+ADD ./target/pig-auth.jar ./

 CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-auth.jar
--- a/pig-auth/pom.xml
+++ b/pig-auth/pom.xml
@ -85,6 +85,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>

--- a/pig-codegen/Dockerfile
+++ b/pig-codegen/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /pig-codegen

 EXPOSE 5003

-ADD ./pig-codegen/target/pig-codegen.jar ./
+ADD ./target/pig-codegen.jar ./

 CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-codegen.jar
--- a/pig-codegen/pom.xml
+++ b/pig-codegen/pom.xml
@ -88,6 +88,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 </project>
--- a/pig-gateway/Dockerfile
+++ b/pig-gateway/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /pig-gateway

 EXPOSE 9999

-ADD ./pig-gateway/target/pig-gateway.jar ./
+ADD ./target/pig-gateway.jar ./

 CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-gateway.jar
--- a/pig-gateway/pom.xml
+++ b/pig-gateway/pom.xml
@ -80,6 +80,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>

--- a/pig-monitor/Dockerfile
+++ b/pig-monitor/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /pig-monitor

 EXPOSE 5001

-ADD ./pig-monitor/target/pig-monitor.jar ./
+ADD ./target/pig-monitor.jar ./

 CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-monitor.jar
--- a/pig-monitor/pom.xml
+++ b/pig-monitor/pom.xml
@ -69,6 +69,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>

--- a/pig-register/Dockerfile
+++ b/pig-register/Dockerfile
@ -10,8 +10,7 @@ WORKDIR /pig-register

 EXPOSE 8848

-ADD ./pig-register/target/pig-register.jar ./
-
+ADD ./target/pig-register.jar ./

 CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pig-register.jar

--- a/pig-register/pom.xml
+++ b/pig-register/pom.xml
@ -70,6 +70,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
--- a/pig-upms/pig-upms-biz/Dockerfile
+++ b/pig-upms/pig-upms-biz/Dockerfile
@ -10,6 +10,6 @@ WORKDIR /pigx-upms

 EXPOSE 4000

-ADD ./pig-upms/pig-upms-biz/target/pig-upms-biz.jar ./
+ADD ./target/pig-upms-biz.jar ./

 CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-upms-biz.jar
--- a/pig-upms/pig-upms-biz/pom.xml
+++ b/pig-upms/pig-upms-biz/pom.xml
@ -88,6 +88,10 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>

--- a/pom.xml
+++ b/pom.xml
@ -48,6 +48,12 @@
 		<jasypt.version>2.1.0</jasypt.version>
 		<swagger.fox.version>2.9.2</swagger.fox.version>
 		<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
+		<docker.registry>http://172.17.0.111:2375</docker.registry>
+		<docker.host>172.17.0.111</docker.host>
+		<docker.namespace>library</docker.namespace>
+		<docker.username>admin</docker.username>
+		<docker.password>Harbor12345</docker.password>
+		<docker.plugin.version>0.32.0</docker.plugin.version>
 	</properties>

 	<dependencies>
@ -180,6 +186,29 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>io.fabric8</groupId>
+					<artifactId>docker-maven-plugin</artifactId>
+					<version>${docker.plugin.version}</version>
+					<configuration>
+						<dockerHost>${docker.host}</dockerHost>
+						<registry>${docker.registry}</registry>
+						<authConfig>
+							<push>
+								<username>${docker.username}</username>
+								<password>${docker.password}</password>
+							</push>
+						</authConfig>
+						<images>
+							<image>
+								<name>${docker.host}/${docker.namespace}/${project.name}:${project.version}</name>
+								<build>
+									<dockerFile>${project.basedir}/Dockerfile</dockerFile>
+								</build>
+							</image>
+						</images>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>