🐳 Work about Docker. 修改docker context

This commit is contained in:
冷冷 committed 2020-01-18 16:42:40 +08:00
1 parent 1d12327219
commit 619f5ffab4
52 files changed
+113 -133

No files matched your search

+8 -8
View File
@@ -4,18 +4,18 @@ MAINTAINER lengleng(wangiegie@gmail.com)
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
COPY ./db/1schema.sql /docker-entrypoint-initdb.d
COPY ./1schema.sql /docker-entrypoint-initdb.d
COPY ./db/2pigxx.sql /docker-entrypoint-initdb.d
COPY ./2pigxx.sql /docker-entrypoint-initdb.d
COPY ./db/3pigxx_ac.sql /docker-entrypoint-initdb.d
COPY ./3pigxx_ac.sql /docker-entrypoint-initdb.d
COPY ./db/4pigxx_job.sql /docker-entrypoint-initdb.d
COPY ./4pigxx_job.sql /docker-entrypoint-initdb.d
COPY ./db/5pigxx_mp.sql /docker-entrypoint-initdb.d
COPY ./5pigxx_mp.sql /docker-entrypoint-initdb.d
COPY ./db/6pigxx_config.sql /docker-entrypoint-initdb.d
COPY ./6pigxx_config.sql /docker-entrypoint-initdb.d
COPY ./db/7pigxx_pay.sql /docker-entrypoint-initdb.d
COPY ./7pigxx_pay.sql /docker-entrypoint-initdb.d
COPY ./db/8pigxx_codegen.sql /docker-entrypoint-initdb.d
COPY ./8pigxx_codegen.sql /docker-entrypoint-initdb.d
+14 -28
View File
@@ -7,8 +7,7 @@ version: '2'
services:
pigx-mysql:
build:
context: ./
dockerfile: ./db/Dockerfile
context: ./db
environment:
MYSQL_ROOT_PASSWORD: root
restart: always
@@ -57,8 +56,7 @@ services:
pigx-register:
build:
context: ./
dockerfile: ./pigx-register/Dockerfile
context: ./pigx-register
restart: always
container_name: pigx-register
image: pigx-register
@@ -67,8 +65,7 @@ services:
pigx-gateway:
build:
context: ./
dockerfile: ./pigx-gateway/Dockerfile
context: ./pigx-gateway
restart: always
container_name: pigx-gateway
image: pigx-gateway
@@ -77,24 +74,21 @@ services:
pigx-auth:
build:
context: ./
dockerfile: ./pigx-auth/Dockerfile
context: ./pigx-auth
restart: always
container_name: pigx-auth
image: pigx-auth
pigx-upms:
build:
context: ./
dockerfile: ./pigx-upms/pigx-upms-biz/Dockerfile
context: ./pigx-upms/pigx-upms-biz
restart: always
container_name: pigx-upms
image: pigx-upms
pigx-monitor:
build:
context: ./
dockerfile: ./pigx-visual/pigx-monitor/Dockerfile
context: ./pigx-visual/pigx-monitor
restart: always
image: pigx-monitor
container_name: pigx-monitor
@@ -103,56 +97,49 @@ services:
pigx-daemon-quartz:
build:
context: ./
dockerfile: ./pigx-visual/pigx-daemon-quartz/Dockerfile
context: ./pigx-visual/pigx-daemon-quartz
restart: always
image: pigx-daemon-quartz
container_name: pigx-daemon-quartz
pigx-daemon-elastic-job:
build:
context: ./
dockerfile: ./pigx-visual/pigx-daemon-elastic-job/Dockerfile
context: ./pigx-visual/pigx-daemon-elastic-job
restart: always
image: pigx-daemon-elastic-job
container_name: pigx-daemon-elastic-job
pigx-codegen:
build:
context: ./
dockerfile: ./pigx-visual/pigx-codegen/Dockerfile
context: ./pigx-visual/pigx-codegen
restart: always
image: pigx-codegen
container_name: pigx-codegen
pigx-mp-platform:
build:
context: ./
dockerfile: ./pigx-visual/pigx-mp-platform/Dockerfile
context: ./pigx-visual/pigx-mp-platform
restart: always
image: pigx-mp-platform
container_name: pigx-mp-platform
pigx-pay-platform:
build:
context: ./
dockerfile: ./pigx-visual/pigx-pay-platform/Dockerfile
context: ./pigx-visual/pigx-pay-platform
restart: always
image: pigx-pay-platform
container_name: pigx-pay-platform
pigx-oa-platform:
build:
context: ./
dockerfile: ./pigx-visual/pigx-oa-platform/Dockerfile
context: ./pigx-visual/pigx-oa-platform
restart: always
image: pigx-oa-platform
container_name: pigx-oa-platform
pigx-tx-manager:
build:
context: ./
dockerfile: ./pigx-visual/pigx-tx-manager/Dockerfile
context: ./pigx-visual/pigx-tx-manager
restart: always
image: pigx-tx-manager
container_name: pigx-tx-manager
@@ -162,8 +149,7 @@ services:
pigx-sentinel:
build:
context: ./
dockerfile: ./pigx-visual/pigx-sentinel-dashboard/Dockerfile
context: ./pigx-visual/pigx-sentinel-dashboard
restart: always
image: pigx-sentinel
container_name: pigx-sentinel
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-auth
EXPOSE 3000
ADD ./pigx-auth/target/pigx-auth.jar ./
ADD ./target/pigx-auth.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-auth.jar
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-auth</artifactId>
@@ -107,7 +107,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+3 -3
View File
@@ -17,8 +17,8 @@
<description>pigx 公共版本控制</description>
<properties>
<pigx.version>3.6.0</pigx.version>
<mybatis-plus.version>3.3.0</mybatis-plus.version>
<pigx.version>3.7.0</pigx.version>
<mybatis-plus.version>3.3.1</mybatis-plus.version>
<druid.version>1.1.21</druid.version>
<mysql.connector.version>8.0.18</mysql.connector.version>
<swagger.core.version>1.5.22</swagger.core.version>
@@ -152,7 +152,7 @@
<plugin>
<groupId>com.pig4cloud.plugin</groupId>
<artifactId>spring-cloud-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<executions>
<execution>
<phase>package</phase>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-core</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-data</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>pigx-common</artifactId>
<groupId>com.pig4cloud</groupId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-gateway</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-gray</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-job</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-log</artifactId>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-minio</artifactId>
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-security</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-sequence</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-swagger</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common-transaction</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-common</artifactId>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-gateway
EXPOSE 9999
ADD ./pigx-gateway/target/pigx-gateway.jar ./
ADD ./target/pigx-gateway.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-gateway.jar
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-gateway</artifactId>
@@ -103,7 +103,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -21,7 +21,7 @@ import com.pig4cloud.pigx.gateway.handler.ImageCodeHandler;
import com.pig4cloud.pigx.gateway.handler.SwaggerResourceHandler;
import com.pig4cloud.pigx.gateway.handler.SwaggerSecurityHandler;
import com.pig4cloud.pigx.gateway.handler.SwaggerUiHandler;
import lombok.AllArgsConstructor;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -37,12 +37,12 @@ import org.springframework.web.reactive.function.server.RouterFunctions;
*/
@Slf4j
@Configuration
@AllArgsConstructor
@RequiredArgsConstructor
public class RouterFunctionConfiguration {
private final SwaggerResourceHandler swaggerResourceHandler;
private final SwaggerSecurityHandler swaggerSecurityHandler;
private final SwaggerUiHandler swaggerUiHandler;
private final ImageCodeHandler imageCodeHandler;
private ImageCodeHandler imageCodeHandler;
@Bean
public RouterFunction routerFunction() {
+1 -1
View File
@@ -10,7 +10,7 @@ WORKDIR /pigx-register
EXPOSE 8848
ADD ./pigx-register/target/pigx-register.jar ./
ADD ./target/pigx-register.jar ./
CMD sleep 60;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-register.jar
+2 -2
View File
@@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-register</artifactId>
@@ -71,7 +71,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-upms-api</artifactId>
@@ -68,10 +68,10 @@ public class SysOauthClientDetails extends Model<SysOauthClientDetails> {
@ApiModelProperty(value = "作用域")
private String scope;
/**
* 授权方式(A,B,C)
* 授权方式[A,B,C]
*/
@ApiModelProperty(value = "授权方式")
private String authorizedGrantTypes;
private String[] authorizedGrantTypes;
/**
* 回调地址
*/
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-upms
EXPOSE 4000
ADD ./pigx-upms/pigx-upms-biz/target/pigx-upms-biz.jar ./
ADD ./target/pigx-upms-biz.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-upms-biz</artifactId>
@@ -121,7 +121,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-upms</artifactId>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-codegen
EXPOSE 5003
ADD ./pigx-visual/pigx-codegen/target/pigx-codegen.jar ./
ADD ./target/pigx-codegen.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-codegen.jar
+2 -2
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-codegen</artifactId>
@@ -93,7 +93,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -10,6 +10,6 @@ WORKDIR /pigx-daemon-elastic-job
EXPOSE 5002
ADD ./pigx-visual/pigx-daemon-elastic-job/target/pigx-daemon-elastic-job.jar ./
ADD ./target/pigx-daemon-elastic-job.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic-job.jar
+2 -2
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-daemon-elastic-job</artifactId>
@@ -110,7 +110,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-daemon-quartz
EXPOSE 5007
ADD ./pigx-visual/pigx-daemon-quartz/target/pigx-daemon-quartz.jar ./
ADD ./target/pigx-daemon-quartz.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-quartz.jar
+2 -2
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -88,7 +88,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-monitor
EXPOSE 5001
ADD ./pigx-visual/pigx-monitor/target/pigx-monitor.jar ./
ADD ./target/pigx-monitor.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-monitor</artifactId>
@@ -91,7 +91,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.zeroturnaround.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
<classpath>
<dir name="/Users/lengleng/work/my/super/pigx/pigx-visual/pigx-mp-manager/target/classes">
</dir>
</classpath>
</application>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-mp-platform
EXPOSE 6000
ADD ./pigx-visual/pigx-mp-platform/target/pigx-mp-platform.jar ./
ADD ./target/pigx-mp-platform.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-mp-platform.jar
+2 -2
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-mp-platform</artifactId>
@@ -92,7 +92,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-oa-platform
EXPOSE 5005
ADD ./pigx-visual/pigx-oa-platform/target/pigx-oa-platform.jar ./
ADD ./target/pigx-oa-platform.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-oa-platform.jar
+2 -2
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-oa-platform</artifactId>
@@ -150,7 +150,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
+1 -1
View File
@@ -10,6 +10,6 @@ WORKDIR /pigx-pay-platform
EXPOSE 5010
ADD ./pigx-visual/pigx-pay-platform/target/pigx-pay-platform.jar ./
ADD ./target/pigx-pay-platform.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-pay-platform.jar
+2 -2
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-pay-platform</artifactId>
@@ -110,7 +110,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -10,6 +10,6 @@ WORKDIR /pigx-sentinel-dashboard
EXPOSE 5020
ADD ./pigx-visual/pigx-sentinel-dashboard/target/pigx-sentinel-dashboard.jar ./
ADD ./target/pigx-sentinel-dashboard.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-sentinel-dashboard.jar
+2 -2
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-sentinel-dashboard</artifactId>
@@ -109,7 +109,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
@@ -10,7 +10,8 @@ logging:
org:
springframework:
web: info
file: ${user.home}/logs/csp/sentinel-dashboard.log
file:
name: ${user.home}/logs/csp/sentinel-dashboard.log
pattern:
file: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n'
+1 -1
View File
@@ -29,7 +29,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<dependencies>
+1 -1
View File
@@ -11,6 +11,6 @@ WORKDIR /pigx-tx-manager
EXPOSE 5004
EXPOSE 9998
ADD ./pigx-visual/pigx-tx-manager/target/pigx-tx-manager.jar ./
ADD ./target/pigx-tx-manager.jar ./
CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-tx-manager.jar
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-tx-manager</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
</parent>
<artifactId>pigx-visual</artifactId>
+25 -18
View File
@@ -24,7 +24,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<organization>
@@ -33,7 +33,7 @@
</organization>
<properties>
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
<spring-boot.version>2.2.3.RELEASE</spring-boot.version>
<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
<spring-cloud-alibaba.version>2.1.1.RELEASE</spring-cloud-alibaba.version>
<spring-platform.version>Cairo-SR8</spring-platform.version>
@@ -55,9 +55,12 @@
<xxl.job.version>2.1.1</xxl.job.version>
<security.oauth.version>2.3.6.RELEASE</security.oauth.version>
<activiti.version>5.22.0</activiti.version>
<docker.url>http://192.168.0.13:4243</docker.url>
<docker.plugin.version>0.4.12</docker.plugin.version>
<registry.url>192.168.0.13:5000</registry.url>
<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>
@@ -190,22 +193,26 @@
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${docker.plugin.version}</version>
<configuration>
<imageName>${registry.url}/${project.name}:0.0.1</imageName>
<dockerHost>${docker.url}</dockerHost>
<dockerDirectory>${project.basedir}</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
<serverId>docker-hub</serverId>
<registryUrl>https://index.docker.io/v1/</registryUrl>
<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>