mirror of
https://gitee.com/log4j/pig.git
synced 2024-12-22 12:48:58 +08:00
⏪ Reverting changes. Dockerfile remove wait-for-it
This commit is contained in:
东哥兄弟
parent
992f66594e
commit
3b4e8f6eda
@ -39,7 +39,7 @@ BEGIN;
|
||||
INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', '# 加解密根密码\njasypt:\n encryptor:\n password: pig #根密码\n\n# Spring 相关\nspring:\n redis:\n password:\n host: pig-redis\n cloud:\n sentinel:\n eager: true\n transport:\n dashboard: pig-sentinel:5003\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\n#请求处理的超时时间\nribbon:\n ReadTimeout: 10000\n ConnectTimeout: 10000\n\n# mybaits-plus配置\nmybatis-plus:\n mapper-locations: classpath:/mapper/*Mapper.xml\n global-config:\n banner: false\n db-config:\n id-type: auto\n table-underline: true\n logic-delete-value: 1\n logic-not-delete-value: 0\n configuration:\n map-underscore-to-camel-case: true\n\n# spring security 配置\nsecurity:\n oauth2:\n resource:\n loadBalanced: true\n token-info-uri: http://pig-auth/oauth/check_token\n # 通用放行URL，服务个性化，请在对应配置文件覆盖\n ignore:\n urls:\n - /v2/api-docs\n - /actuator/**\n# swagger 配置\nswagger:\n title: Pig Swagger API\n license: Powered By pig4cloud\n licenseUrl: https://pig4cloud.com\n terms-of-service-url: https://pig4cloud.com\n contact:\n email: wangiegie@gmail.com\n url: https://pig4cloud.com\n authorization:\n name: pig4cloud OAuth\n auth-regex: ^.*$\n authorization-scope-list:\n - scope: server\n description: server all\n token-url-list:\n - http://${GATEWAY_HOST:pig-gateway}:${GATEWAY-PORT:9999}/auth/oauth/token', '841de89cde20a1a045f46001f9a89266', '2019-11-29 16:31:20', '2020-06-11 16:28:09', NULL, '127.0.0.1', '', '', '通用配置', 'null', 'null', 'yaml', 'null');
|
||||
INSERT INTO `config_info` VALUES (2, 'pig-auth-dev.yml', 'DEFAULT_GROUP', '# 数据源\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: root\n password: root\n url: jdbc:mysql://pig-mysql:3306/pig?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai\n freemarker:\n allow-request-override: false\n allow-session-override: false\n cache: true\n charset: UTF-8\n check-template-location: true\n content-type: text/html\n enabled: true\n expose-request-attributes: false\n expose-session-attributes: false\n expose-spring-macro-helpers: true\n prefer-file-system-access: true\n suffix: .ftl\n template-loader-path: classpath:/templates/', '58b1b48a2888f49e667864be32edf9c1', '2019-11-29 16:31:48', '2020-01-01 18:30:58', NULL, '127.0.0.1', '', '', '认证中心配置', 'null', 'null', 'yaml', 'null');
|
||||
INSERT INTO `config_info` VALUES (3, 'pig-codegen-dev.yml', 'DEFAULT_GROUP', '## spring security 配置\nsecurity:\n oauth2:\n client:\n client-id: ENC(27v1agvAug87ANOVnbKdsw==)\n client-secret: ENC(VbnkopxrwgbFVKp+UxJ2pg==)\n scope: server\n\n# 数据源配置\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: root\n password: root\n url: jdbc:mysql://pig-mysql:3306/pig_codegen?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai\n resources:\n static-locations: classpath:/static/,classpath:/views/\n\n# 直接放行URL\nignore:\n urls:\n - /v2/api-docs\n - /actuator/**\n', 'abc702838b34d11b46e96143ccd9f367', '2019-11-29 16:32:12', '2019-11-29 16:32:12', NULL, '127.0.0.1', '', '', '代码生成配置', NULL, NULL, 'yaml', NULL);
|
||||
INSERT INTO `config_info` VALUES (4, 'pig-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n cloud:\n gateway:\n locator:\n enabled: true\n routes:\n # 认证中心\n - id: pig-auth\n uri: lb://pig-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - ValidateCodeGatewayFilter\n # 前端密码解密\n - PasswordDecoderFilter\n #UPMS 模块\n - id: pig-upms-biz\n uri: lb://pig-upms-biz\n predicates:\n - Path=/admin/**\n filters:\n # 限流配置\n - name: RequestRateLimiter\n args:\n key-resolver: \'#{@remoteAddrKeyResolver}\'\n redis-rate-limiter.replenishRate: 10\n redis-rate-limiter.burstCapacity: 20\n # 降级配置\n - name: Hystrix\n args:\n name: default\n fallbackUri: \'forward:/fallback\'\n # 代码生成模块\n - id: pig-codegen\n uri: lb://pig-codegen\n predicates:\n - Path=/gen/**\n\n\nsecurity:\n encode:\n # 前端密码密钥，必须16位\n key: \'thanks,pig4cloud\'\n\n# 不校验验证码终端\nignore:\n clients:\n - test\n', '32ce953f48c958bb869a7e3e442a4a11', '2019-11-29 16:32:42', '2019-11-29 16:32:42', NULL, '127.0.0.1', '', '', '网关配置', NULL, NULL, 'yaml', NULL);
|
||||
INSERT INTO `config_info` VALUES (4, 'pig-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n cloud:\n gateway:\n locator:\n enabled: true\n routes:\n # 认证中心\n - id: pig-auth\n uri: lb://pig-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - ValidateCodeGatewayFilter\n # 前端密码解密\n - PasswordDecoderFilter\n #UPMS 模块\n - id: pig-upms-biz\n uri: lb://pig-upms-biz\n predicates:\n - Path=/admin/**\n filters:\n # 限流配置\n - name: RequestRateLimiter\n args:\n key-resolver: \'#{@remoteAddrKeyResolver}\'\n redis-rate-limiter.replenishRate: 100\n redis-rate-limiter.burstCapacity: 200\n # 代码生成模块\n - id: pig-codegen\n uri: lb://pig-codegen\n predicates:\n - Path=/gen/**\n\n\nsecurity:\n encode:\n # 前端密码密钥，必须16位\n key: \'thanks,pig4cloud\'\n\n# 不校验验证码终端\nignore:\n clients:\n - test\n', '6dfb01b7636af477135c1bfeba2fd48d', '2019-11-29 16:32:42', '2020-06-23 10:34:28', NULL, '172.17.0.156', '', '', '网关配置', '', '', 'yaml', '');
|
||||
INSERT INTO `config_info` VALUES (5, 'pig-monitor-dev.yml', 'DEFAULT_GROUP', 'spring:\n # 安全配置\n security:\n user:\n name: ENC(8Hk2ILNJM8UTOuW/Xi75qg==) # pig\n password: ENC(o6cuPFfUevmTbkmBnE67Ow====) # pig\n', '85509c6f8c67c364dc78301896274f26', '2019-11-29 16:33:05', '2019-11-29 16:33:05', NULL, '127.0.0.1', '', '', '监控配置', NULL, NULL, 'yaml', NULL);
|
||||
INSERT INTO `config_info` VALUES (6, 'pig-upms-biz-dev.yml', 'DEFAULT_GROUP', 'security:\n oauth2:\n client:\n client-id: ENC(imENTO7M8bLO38LFSIxnzw==)\n client-secret: ENC(i3cDFhs26sa2Ucrfz2hnQw==)\n scope: server\n\n# 数据源\nspring:\n datasource:\n type: com.zaxxer.hikari.HikariDataSource\n driver-class-name: com.mysql.cj.jdbc.Driver\n username: root\n password: root\n url: jdbc:mysql://pig-mysql:3306/pig?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai\n', '3248f7cf9ea2ce40cd41cd664ec32ae0', '2019-11-29 16:52:32', '2020-03-14 16:24:24', NULL, '172.17.0.125', '', '', '统一权限', 'null', 'null', 'yaml', 'null');
|
||||
COMMIT;
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-auth.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV NACOS_HOST pig-register
|
||||
RUN mkdir -p /pig-auth
|
||||
|
||||
ENV NACOS_PORT 8848
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-auth
|
||||
|
||||
EXPOSE 3000
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-auth.jar ./
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$NACOS_HOST:$NACOS_PORT","--","java", "-jar","app.jar" , "-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-auth.jar
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-gateway.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV NACOS_HOST pig-register
|
||||
RUN mkdir -p /pig-gateway
|
||||
|
||||
ENV NACOS_PORT 8848
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-gateway
|
||||
|
||||
EXPOSE 9999
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-gateway.jar ./
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$NACOS_HOST:$NACOS_PORT","--","java","-jar","app.jar","-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-gateway.jar
|
||||
|
||||
@ -1,27 +1,19 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-register.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV MYSQL_HOST pig-mysql
|
||||
RUN mkdir -p /pig-register
|
||||
|
||||
ENV MYSQL_PORT 3306
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-register
|
||||
|
||||
EXPOSE 8848
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-register.jar ./
|
||||
|
||||
CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pig-register.jar
|
||||
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$MYSQL_HOST:$MYSQL_PORT","--","java", "-jar","app.jar","-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-upms-biz.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV NACOS_HOST pig-register
|
||||
RUN mkdir -p /pig-upms
|
||||
|
||||
ENV NACOS_PORT 8848
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-upms
|
||||
|
||||
EXPOSE 4000
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-upms-biz.jar ./
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$NACOS_HOST:$NACOS_PORT","--","java","-jar","app.jar","-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-upms-biz.jar
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-codegen.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV NACOS_HOST pig-register
|
||||
RUN mkdir -p /pig-codegen
|
||||
|
||||
ENV NACOS_PORT 8848
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-codegen
|
||||
|
||||
EXPOSE 5002
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-codegen.jar ./
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$NACOS_HOST:$NACOS_PORT","--","java", "-jar","app.jar" , "-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-codegen.jar
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-monitor.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV NACOS_HOST pig-register
|
||||
RUN mkdir -p /pig-monitor
|
||||
|
||||
ENV NACOS_PORT 8848
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-monitor
|
||||
|
||||
EXPOSE 5001
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-monitor.jar ./
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$NACOS_HOST:$NACOS_PORT","--","java","-jar","app.jar","-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar pig-monitor.jar
|
||||
|
||||
@ -1,27 +1,17 @@
|
||||
# pig4cloud/java:8镜像增加了中文字体与wait-for-it.sh的支持
|
||||
# 镜像链接:https://hub.docker.com/r/pig4cloud/java/
|
||||
# wait-for-it.sh采用https://github.com/vishnubob/wait-for-it作为解决方案
|
||||
FROM pig4cloud/java:8
|
||||
FROM anapsix/alpine-java:8_server-jre_unlimited
|
||||
|
||||
MAINTAINER wangiegie@gmail.com
|
||||
|
||||
ARG JAR_FILE=./target/pig-sentinel-dashboard.jar
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# JVM调优参数等额外参数
|
||||
ENV PARAMS ""
|
||||
RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
ENV NACOS_HOST pig-register
|
||||
RUN mkdir -p /pig-sentinel
|
||||
|
||||
ENV NACOS_PORT 8848
|
||||
|
||||
ENV TZ=PRC
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
WORKDIR /tmp
|
||||
WORKDIR /pig-sentinel
|
||||
|
||||
EXPOSE 5003
|
||||
|
||||
ADD ${JAR_FILE} ./app.jar
|
||||
ADD ./target/pig-sentinel-dashboard.jar ./
|
||||
|
||||
ENTRYPOINT ["wait-for-it.sh","$NACOS_HOST:$NACOS_PORT","--","java","-jar","app.jar","-Djava.security.egd=file:/dev/./urandom","$PARAMS"]
|
||||
CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pig-sentinel-dashboard.jar
|
||||
|
||||
Loading…
Reference in New Issue
Block a user