From 7fd0b46b4ad0ae1e08006c1cebb368f95e9039d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=91=E5=BD=A9ing?= <382170522@qq.com> Date: Sun, 12 Sep 2021 22:59:00 +0800 Subject: [PATCH] :whale: remove layer image :whale: remove layer image --- pig-auth/Dockerfile | 25 ++++++++----------- .../PigUserAuthenticationConverter.java | 14 +++++------ pig-gateway/Dockerfile | 24 ++++++++---------- pig-register/Dockerfile | 23 +++++++---------- pig-upms/pig-upms-biz/Dockerfile | 24 ++++++++---------- pig-visual/pig-codegen/Dockerfile | 24 ++++++++---------- pig-visual/pig-monitor/Dockerfile | 24 ++++++++---------- pig-visual/pig-sentinel-dashboard/Dockerfile | 24 ++++++++---------- pig-visual/pig-xxl-job-admin/Dockerfile | 24 ++++++++---------- 9 files changed, 85 insertions(+), 121 deletions(-) diff --git a/pig-auth/Dockerfile b/pig-auth/Dockerfile index 5cf7383e..5265c46e 100755 --- a/pig-auth/Dockerfile +++ b/pig-auth/Dockerfile @@ -1,20 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-auth.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai -ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-auth -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-auth + +WORKDIR /pig-auth + +ARG JAR_FILE=target/pig-auth.jar + +COPY ${JAR_FILE} app.jar EXPOSE 3000 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java index e880d48d..c11544af 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java @@ -16,6 +16,7 @@ package com.pig4cloud.pig.common.security.component; +import cn.hutool.core.map.MapUtil; import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.security.datascope.UserDataScope; import com.pig4cloud.pig.common.security.service.PigUser; @@ -26,12 +27,7 @@ import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.oauth2.provider.token.UserAuthenticationConverter; import org.springframework.util.StringUtils; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * @author lengleng @@ -78,8 +74,10 @@ public class PigUserAuthenticationConverter implements UserAuthenticationConvert Object value = map.get(SecurityConstants.DETAILS_USER_DATA_SCOPE); if (value != null) { Map userDataScopeMap = (Map) value; - userDataScope.setAllScope((boolean) userDataScopeMap.get("allScope")); - userDataScope.setOnlySelf((boolean) userDataScopeMap.get("onlySelf")); + userDataScope.setAllScope(MapUtil.getBool(userDataScopeMap, "allScope")); + userDataScope.setOnlySelf(MapUtil.getBool(userDataScopeMap, "onlySelf")); + + userDataScope.setScopeUserIds(new HashSet<>((List) userDataScopeMap.get("scopeUserIds"))); userDataScope.setScopeUserIds(new HashSet<>((List) userDataScopeMap.get("scopeUserIds"))); userDataScope.setScopeDeptIds(new HashSet<>((List) userDataScopeMap.get("scopeDeptIds"))); } diff --git a/pig-gateway/Dockerfile b/pig-gateway/Dockerfile index d33353eb..90b3544a 100755 --- a/pig-gateway/Dockerfile +++ b/pig-gateway/Dockerfile @@ -1,19 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-gateway.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-gateway -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-gateway + +WORKDIR /pig-gateway + +ARG JAR_FILE=target/pig-gateway.jar + +COPY ${JAR_FILE} app.jar EXPOSE 9999 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/pig-register/Dockerfile b/pig-register/Dockerfile index f989b9bd..02bb9c52 100755 --- a/pig-register/Dockerfile +++ b/pig-register/Dockerfile @@ -1,20 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-register.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-register +RUN mkdir -p /pig-register + +WORKDIR /pig-register -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +ARG JAR_FILE=target/pig-register.jar + +COPY ${JAR_FILE} app.jar EXPOSE 8848 -CMD sleep 30; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 30; java -jar app.jar $JAVA_OPTS diff --git a/pig-upms/pig-upms-biz/Dockerfile b/pig-upms/pig-upms-biz/Dockerfile index 10f98efa..90b6ba6b 100644 --- a/pig-upms/pig-upms-biz/Dockerfile +++ b/pig-upms/pig-upms-biz/Dockerfile @@ -1,19 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-upms-biz.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-upms -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-upms-biz + +WORKDIR /pig-upms-biz + +ARG JAR_FILE=target/pig-upms-biz.jar + +COPY ${JAR_FILE} app.jar EXPOSE 4000 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/pig-visual/pig-codegen/Dockerfile b/pig-visual/pig-codegen/Dockerfile index b2ae3377..a90156b4 100644 --- a/pig-visual/pig-codegen/Dockerfile +++ b/pig-visual/pig-codegen/Dockerfile @@ -1,19 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-codegen.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-codegen -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-codegen + +WORKDIR /pig-codegen + +ARG JAR_FILE=target/pig-codegen.jar + +COPY ${JAR_FILE} app.jar EXPOSE 5002 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/pig-visual/pig-monitor/Dockerfile b/pig-visual/pig-monitor/Dockerfile index 98e1e3cc..c4d35690 100755 --- a/pig-visual/pig-monitor/Dockerfile +++ b/pig-visual/pig-monitor/Dockerfile @@ -1,19 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-monitor.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-monitor -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-monitor + +WORKDIR /pig-monitor + +ARG JAR_FILE=target/pig-monitor.jar + +COPY ${JAR_FILE} app.jar EXPOSE 5001 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/pig-visual/pig-sentinel-dashboard/Dockerfile b/pig-visual/pig-sentinel-dashboard/Dockerfile index 1c60d776..6ea0326f 100644 --- a/pig-visual/pig-sentinel-dashboard/Dockerfile +++ b/pig-visual/pig-sentinel-dashboard/Dockerfile @@ -1,19 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-sentinel-dashboard.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-sentinel-dashboard -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-sentinel-dashboard + +WORKDIR /pig-sentinel-dashboard + +ARG JAR_FILE=target/pig-sentinel-dashboard.jar + +COPY ${JAR_FILE} app.jar EXPOSE 5003 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/pig-visual/pig-xxl-job-admin/Dockerfile b/pig-visual/pig-xxl-job-admin/Dockerfile index 4fab252b..2eced2db 100644 --- a/pig-visual/pig-xxl-job-admin/Dockerfile +++ b/pig-visual/pig-xxl-job-admin/Dockerfile @@ -1,19 +1,15 @@ -FROM moxm/java:1.8-full as builder -WORKDIR /build -ARG JAR_FILE=target/pig-xxl-job-admin.jar -COPY ${JAR_FILE} app.jar -RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar - FROM moxm/java:1.8-full -LABEL maintainer="jclazz@outlook.com" -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" -WORKDIR pig-xxl-job-admin -COPY --from=builder /build/dependencies/ ./ -COPY --from=builder /build/snapshot-dependencies/ ./ -COPY --from=builder /build/spring-boot-loader/ ./ -COPY --from=builder /build/application/ ./ +RUN mkdir -p /pig-xxl-job-admin + +WORKDIR /pig-xxl-job-admin + +ARG JAR_FILE=target/pig-xxl-job-admin.jar + +COPY ${JAR_FILE} app.jar EXPOSE 5004 -CMD sleep 60; java $JAVA_OPTS org.springframework.boot.loader.JarLauncher \ No newline at end of file +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS -- GitLab