mirrors/pig
1
0
Fork 0
mirror of https://gitee.com/log4j/pig.git synced 2024-12-23 13:03:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!90 🐛 Fixing a bug. nacos 不支持 moxm/java:1.8-full 缺少 so

Browse Source 
Merge pull request !90 from lbw/dev
This commit is contained in:
lbw 2020-11-15 17:48:32 +08:00 committed by Gitee
commit 7c6f5e50fd
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pig-register/Dockerfile
View File

@ -4,7 +4,7 @@ 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
FROM moxm/java:1.8-full FROM openjdk:8-jre
LABEL maintainer="jclazz@outlook.com" 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

2
pig-visual/pig-sentinel-dashboard/src/main/resources/bootstrap.yml
View File

@ -10,6 +10,6 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:pig-register}:${NACOS_PORT:8848}
profiles: profiles:
active: @profiles.active@ active: @profiles.active@

2
pig-visual/pig-xxl-job-admin/src/main/resources/application.yml
View File

@ -14,7 +14,7 @@ mybatis:
# spring # spring
spring: spring:
datasource: datasource:
url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true url: jdbc:mysql://${MYSQL_HOST:pig-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pig_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
username: ${MYSQL-PWD:root} username: ${MYSQL-PWD:root}
password: ${MYSQL-PWD:root} password: ${MYSQL-PWD:root}

2
pig-visual/pig-xxl-job-admin/src/main/resources/bootstrap.yml
View File

@ -10,7 +10,7 @@ spring:
cloud: cloud:
nacos: nacos:
discovery: discovery:
server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} server-addr: ${NACOS_HOST:pig-register}:${NACOS_PORT:8848}
metadata: metadata:
management.context-path: ${server.servlet.context-path}/actuator management.context-path: ${server.servlet.context-path}/actuator
profiles: profiles: