forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

🐳 Work about Docker. 优化分层镜像的 Base FROM 镜像 

🔖 🔖 🔖 Releasing / Version tags. 2.10.0

✨ Introducing new features. support docker layer image
This commit is contained in:
let-go 2020-10-04 14:30:40 +08:00 committed by lbwNB
parent f213de9143
commit 4af0b1aa89
32 changed files with 96 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -41,7 +41,7 @@ Spring Cloud | Hoxton.SR8
Spring Cloud Alibaba | 2.2.3.RELEASE Spring Cloud Alibaba | 2.2.3.RELEASE
Spring Security OAuth2 | 2.3.6 Spring Security OAuth2 | 2.3.6
Mybatis Plus | 3.4.0 Mybatis Plus | 3.4.0
hutool | 5.4.3 hutool | 5.4.4
Avue | 2.6.15 Avue | 2.6.15

2
README.zh.md
View File

@ -40,7 +40,7 @@ Spring Cloud | Hoxton.SR8
Spring Cloud Alibaba | 2.2.3.RELEASE Spring Cloud Alibaba | 2.2.3.RELEASE
Spring Security OAuth2 | 2.3.6 Spring Security OAuth2 | 2.3.6
Mybatis Plus | 3.4.0 Mybatis Plus | 3.4.0
hutool | 5.4.3 hutool | 5.4.4
Avue | 2.6.15 Avue | 2.6.15

12
pig-auth/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-auth.jar ARG JAR_FILE=target/pig-auth.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -10,10 +10,10 @@ ENV TZ=Asia/Shanghai
ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-auth WORKDIR pig-auth
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 3000 EXPOSE 3000

8
pig-auth/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-auth</artifactId> <artifactId>pig-auth</artifactId>
@ -44,19 +44,19 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<!--upms api、model 模块--> <!--upms api、model 模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<!--security--> <!--security-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<!--JDBC相关--> <!--JDBC相关-->
<dependency> <dependency>

2
pig-common/pig-common-core/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>

2
pig-common/pig-common-datasource/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pig-common/pig-common-job/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-job</artifactId> <artifactId>pig-common-job</artifactId>

6
pig-common/pig-common-log/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-log</artifactId> <artifactId>pig-common-log</artifactId>
@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<!--UPMS接口模块--> <!--UPMS接口模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<!--安全依赖获取上下文信息--> <!--安全依赖获取上下文信息-->
<dependency> <dependency>

2
pig-common/pig-common-mybatis/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-mybatis</artifactId> <artifactId>pig-common-mybatis</artifactId>

6
pig-common/pig-common-security/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<!--安全模块--> <!--安全模块-->
<dependency> <dependency>
@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

4
pig-common/pig-common-sentinel/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -32,7 +32,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>

2
pig-common/pig-common-swagger/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-swagger</artifactId> <artifactId>pig-common-swagger</artifactId>

4
pig-common/pig-common-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common-test</artifactId> <artifactId>pig-common-test</artifactId>
@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>

2
pig-common/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>

12
pig-gateway/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-gateway.jar ARG JAR_FILE=target/pig-gateway.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-gateway WORKDIR pig-gateway
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 9999 EXPOSE 9999

15
pig-gateway/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-gateway</artifactId> <artifactId>pig-gateway</artifactId>
@ -57,9 +57,8 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--验证码 源码： https://github.com/pig-mesh/EasyCaptcha--> <!--验证码 源码： https://github.com/pig-mesh/easy-captcha -->
<dependency> <dependency>
<groupId>com.pig4cloud.plugin</groupId> <groupId>com.pig4cloud.plugin</groupId>
<artifactId>easy-captcha</artifactId> <artifactId>easy-captcha</artifactId>
@ -67,14 +66,8 @@
</dependency> </dependency>
<!--接口文档--> <!--接口文档-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>springfox-swagger-ui</artifactId> <artifactId>pig-common-swagger</artifactId>
<version>${swagger.fox.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.fox.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

12
pig-register/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-register.jar ARG JAR_FILE=target/pig-register.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-register WORKDIR pig-register
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 8848 EXPOSE 8848

2
pig-register/pom.xml
View File

@ -18,7 +18,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-register</artifactId> <artifactId>pig-register</artifactId>

3
pig-upms/pig-upms-api/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId> <artifactId>pig-upms</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
@ -35,7 +35,6 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--feign 依赖--> <!--feign 依赖-->
<dependency> <dependency>

12
pig-upms/pig-upms-biz/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-upms-biz.jar ARG JAR_FILE=target/pig-upms-biz.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-upms WORKDIR pig-upms
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 4000 EXPOSE 4000

8
pig-upms/pig-upms-biz/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId> <artifactId>pig-upms</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-upms-biz</artifactId> <artifactId>pig-upms-biz</artifactId>
@ -34,31 +34,26 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--安全模块--> <!--安全模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--日志处理--> <!--日志处理-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-log</artifactId> <artifactId>pig-common-log</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--接口文档--> <!--接口文档-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-swagger</artifactId> <artifactId>pig-common-swagger</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--mybatis 模块--> <!--mybatis 模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-mybatis</artifactId> <artifactId>pig-common-mybatis</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--注册中心客户端--> <!--注册中心客户端-->
<dependency> <dependency>
@ -74,7 +69,6 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--undertow容器--> <!--undertow容器-->
<dependency> <dependency>

2
pig-upms/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-upms</artifactId> <artifactId>pig-upms</artifactId>

12
pig-visual/pig-codegen/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-codegen.jar ARG JAR_FILE=target/pig-codegen.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-codegen WORKDIR pig-codegen
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 5002 EXPOSE 5002

9
pig-visual/pig-codegen/pom.xml
View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-codegen</artifactId> <artifactId>pig-codegen</artifactId>
@ -35,7 +35,6 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-swagger</artifactId> <artifactId>pig-common-swagger</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--注册中心客户端--> <!--注册中心客户端-->
<dependency> <dependency>
@ -51,36 +50,30 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--数据源--> <!--数据源-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-datasource</artifactId> <artifactId>pig-common-datasource</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-mybatis</artifactId> <artifactId>pig-common-mybatis</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--common--> <!--common-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--日志处理--> <!--日志处理-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-log</artifactId> <artifactId>pig-common-log</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--安全模块--> <!--安全模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--代码生成模板引擎--> <!--代码生成模板引擎-->
<dependency> <dependency>

12
pig-visual/pig-monitor/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-monitor.jar ARG JAR_FILE=target/pig-monitor.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-monitor WORKDIR pig-monitor
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 5001 EXPOSE 5001

3
pig-visual/pig-monitor/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-monitor</artifactId> <artifactId>pig-monitor</artifactId>
@ -50,7 +50,6 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<version>2.9.2-snapshot</version>
</dependency> </dependency>
<!--undertow容器--> <!--undertow容器-->
<dependency> <dependency>

12
pig-visual/pig-sentinel-dashboard/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-sentinel-dashboard.jar ARG JAR_FILE=target/pig-sentinel-dashboard.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-sentinel-dashboard WORKDIR pig-sentinel-dashboard
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 5003 EXPOSE 5003

2
pig-visual/pig-sentinel-dashboard/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-sentinel-dashboard</artifactId> <artifactId>pig-sentinel-dashboard</artifactId>

12
pig-visual/pig-xxl-job-admin/Dockerfile
View File

@ -1,5 +1,5 @@
FROM openjdk:8-jre as builder FROM moxm/java:1.8-full as builder
WORKDIR build WORKDIR /build
ARG JAR_FILE=target/pig-xxl-job-admin.jar ARG JAR_FILE=target/pig-xxl-job-admin.jar
COPY ${JAR_FILE} app.jar COPY ${JAR_FILE} app.jar
RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar
@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com"
ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
WORKDIR pig-xxl-job-admin WORKDIR pig-xxl-job-admin
COPY --from=builder build/dependencies/ ./ COPY --from=builder /build/dependencies/ ./
COPY --from=builder build/snapshot-dependencies/ ./ COPY --from=builder /build/snapshot-dependencies/ ./
COPY --from=builder build/spring-boot-loader/ ./ COPY --from=builder /build/spring-boot-loader/ ./
COPY --from=builder build/application/ ./ COPY --from=builder /build/application/ ./
EXPOSE 5004 EXPOSE 5004

2
pig-visual/pig-xxl-job-admin/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-xxl-job-admin</artifactId> <artifactId>pig-xxl-job-admin</artifactId>

2
pig-visual/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
</parent> </parent>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>

103
pom.xml
View File

@ -20,14 +20,15 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<!-- 源码: https://gitee.com/log4j/pig-cloud-dependencies-parent -->
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-cloud-dependencies-parent</artifactId> <artifactId>pig-cloud-dependencies-parent</artifactId>
<version>Hoxton.SR8</version> <version>2.10.0</version>
</parent> </parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.9.2-snapshot</version> <version>2.10.0</version>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<url>https://www.pig4cloud.com</url> <url>https://www.pig4cloud.com</url>
@ -39,26 +40,24 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<git.commit.plugin>2.2.5</git.commit.plugin>
<spring.checkstyle.plugin>0.0.23</spring.checkstyle.plugin>
<spring-boot-admin.version>2.3.0</spring-boot-admin.version> <spring-boot-admin.version>2.3.0</spring-boot-admin.version>
<hutool.version>5.4.3</hutool.version> <hutool.version>5.4.4</hutool.version>
<mybatis-plus.version>3.4.0</mybatis-plus.version> <mybatis-plus.version>3.4.0</mybatis-plus.version>
<dynamic-ds.version>3.2.0</dynamic-ds.version> <dynamic-ds.version>3.2.0</dynamic-ds.version>
<captcha.version>2.0.0</captcha.version> <captcha.version>2.0.0</captcha.version>
<velocity.version>1.7</velocity.version> <velocity.version>1.7</velocity.version>
<jasypt.version>2.1.0</jasypt.version> <jasypt.version>2.1.0</jasypt.version>
<fastjson.version>1.2.73</fastjson.version> <fastjson.version>1.2.73</fastjson.version>
<swagger.fox.version>2.9.2</swagger.fox.version> <swagger.fox.version>3.0.0</swagger.fox.version>
<swagger.core.version>1.5.24</swagger.core.version> <swagger.core.version>1.5.24</swagger.core.version>
<xxl-job.version>2.2.0</xxl-job.version> <xxl-job.version>2.2.0</xxl-job.version>
<security.oauth.version>2.3.6.RELEASE</security.oauth.version> <security.oauth.version>2.3.6.RELEASE</security.oauth.version>
<docker.plugin.version>0.32.0</docker.plugin.version> <docker.plugin.version>0.32.0</docker.plugin.version>
<docker.host>http://172.17.0.111:2375</docker.host> <docker.host>http://172.16.1.192:2375</docker.host>
<docker.registry>172.17.0.111</docker.registry> <docker.registry>registry.cn-qingdao.aliyuncs.com</docker.registry>
<docker.namespace>library</docker.namespace> <docker.namespace>pig4cloud</docker.namespace>
<docker.username>admin</docker.username> <docker.username>154987607@qq.com</docker.username>
<docker.password>Harbor12345</docker.password> <docker.password>qq154987607</docker.password>
</properties> </properties>
<dependencies> <dependencies>
@ -110,6 +109,7 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- spring boot 依赖 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId> <artifactId>spring-boot-dependencies</artifactId>
@ -117,6 +117,7 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!-- spring cloud 依赖 -->
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId> <artifactId>spring-cloud-dependencies</artifactId>
@ -124,7 +125,7 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!--spring cloud alibaba--> <!-- spring cloud alibaba 依赖 -->
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId> <artifactId>spring-cloud-alibaba-dependencies</artifactId>
@ -132,42 +133,6 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!--稳定版本，替代spring security bom内置-->
<dependency>
<groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId>
<version>${security.oauth.version}</version>
</dependency>
<!--swagger 最新依赖内置版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger.core.version}</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>${swagger.core.version}</version>
</dependency>
<!--fastjson 版本-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!--web 模块-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<!--排除tomcat依赖-->
<exclusion>
<artifactId>spring-boot-starter-tomcat</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@ -228,50 +193,8 @@
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins>
<!--打包jar 与git commit 关联插件-->
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>${git.commit.plugin}</version>
</plugin>
<!--代码格式插件，默认使用spring 规则-->
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<version>${spring.checkstyle.plugin}</version>
</plugin>
</plugins>
</build> </build>
<repositories>
<!--阿里云主仓库，代理了maven central和jcenter仓库-->
<repository>
<id>aliyun</id>
<name>aliyun</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>aliyun-plugin</id>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<profiles> <profiles>
<profile> <profile>
<id>dev</id> <id>dev</id>