From 447cbf09f4a8a24b4c7664d5fce8365f2910f7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 15 Apr 2019 19:33:38 +0800 Subject: [PATCH] =?UTF-8?q?:whale:=20Work=20about=20Docker.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 8 ++++++++ .../src/main/resources/config/pigx-mp-manager-dev.yml | 2 +- pigx-visual/pigx-mp-manager/Dockerfile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b18be3c9b..09f83db6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,6 +115,14 @@ services: image: pigx-codegen container_name: pigx-codegen + pigx-mp-manager: + build: + context: ./ + dockerfile: ./pigx-visual/pigx-mp-manager/Dockerfile + restart: always + image: pigx-mp-manager + container_name: pigx-mp-manager + pigx-activiti: build: context: ./ diff --git a/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml b/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml index b6ad529b6..7c202c26b 100644 --- a/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-mp-manager-dev.yml @@ -13,7 +13,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: ${MYSQL-USER:root} password: ${MYSQL-PWD:root} - url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://${MYSQL-HOST:pigx-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pigxx_mp}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8 hikari: connection-init-sql: SET NAMES utf8mb4 resources: diff --git a/pigx-visual/pigx-mp-manager/Dockerfile b/pigx-visual/pigx-mp-manager/Dockerfile index 702a7171c..07962fb57 100644 --- a/pigx-visual/pigx-mp-manager/Dockerfile +++ b/pigx-visual/pigx-mp-manager/Dockerfile @@ -8,7 +8,7 @@ RUN mkdir -p /pigx-mp-manager WORKDIR /pigx-mp-manager -EXPOSE 5003 +EXPOSE 6000 ADD ./pigx-visual/pigx-mp-manager/target/pigx-mp-manager.jar ./