From ec66d1df21f5bc99af23c3daeb93b9db5228e808 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 27 Sep 2021 15:25:15 +0800 Subject: [PATCH] fix pos --- eureka-server/Dockerfile | 3 ++- gateway/Dockerfile | 3 ++- service-advertisement/Dockerfile | 3 ++- service-device/Dockerfile | 3 ++- service-inventory/Dockerfile | 3 ++- service-member/Dockerfile | 3 ++- service-org/Dockerfile | 3 ++- service-ota/Dockerfile | 3 ++- service-payment/Dockerfile | 3 ++- service-promotion/Dockerfile | 3 ++- service-ssl/Dockerfile | 3 ++- service-trade/Dockerfile | 3 ++- service-user/Dockerfile | 3 ++- service-wxopen/Dockerfile | 3 ++- 14 files changed, 28 insertions(+), 14 deletions(-) diff --git a/eureka-server/Dockerfile b/eureka-server/Dockerfile index 25034b0..3a33687 100644 --- a/eureka-server/Dockerfile +++ b/eureka-server/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/gateway/Dockerfile b/gateway/Dockerfile index 25034b0..3a33687 100644 --- a/gateway/Dockerfile +++ b/gateway/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-advertisement/Dockerfile b/service-advertisement/Dockerfile index 25034b0..3a33687 100644 --- a/service-advertisement/Dockerfile +++ b/service-advertisement/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-device/Dockerfile b/service-device/Dockerfile index 25034b0..3a33687 100644 --- a/service-device/Dockerfile +++ b/service-device/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-inventory/Dockerfile b/service-inventory/Dockerfile index 25034b0..3a33687 100644 --- a/service-inventory/Dockerfile +++ b/service-inventory/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-member/Dockerfile b/service-member/Dockerfile index 25034b0..3a33687 100644 --- a/service-member/Dockerfile +++ b/service-member/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-org/Dockerfile b/service-org/Dockerfile index 25034b0..3a33687 100644 --- a/service-org/Dockerfile +++ b/service-org/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-ota/Dockerfile b/service-ota/Dockerfile index 25034b0..3a33687 100644 --- a/service-ota/Dockerfile +++ b/service-ota/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-payment/Dockerfile b/service-payment/Dockerfile index 25034b0..3a33687 100644 --- a/service-payment/Dockerfile +++ b/service-payment/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-promotion/Dockerfile b/service-promotion/Dockerfile index 25034b0..3a33687 100644 --- a/service-promotion/Dockerfile +++ b/service-promotion/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-ssl/Dockerfile b/service-ssl/Dockerfile index 25034b0..3a33687 100644 --- a/service-ssl/Dockerfile +++ b/service-ssl/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-trade/Dockerfile b/service-trade/Dockerfile index 25034b0..3a33687 100644 --- a/service-trade/Dockerfile +++ b/service-trade/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-user/Dockerfile b/service-user/Dockerfile index d94261e..fdf296a 100644 --- a/service-user/Dockerfile +++ b/service-user/Dockerfile @@ -1,10 +1,11 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN sed -i 's/http:\/\/dl-cdn.alpinelinux.org/https:\/\/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk add --update font-adobe-100dpi ttf-dejavu fontconfig \ && rm -rf /var/cache/apk/* RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file diff --git a/service-wxopen/Dockerfile b/service-wxopen/Dockerfile index 25034b0..3a33687 100644 --- a/service-wxopen/Dockerfile +++ b/service-wxopen/Dockerfile @@ -1,7 +1,8 @@ FROM openjdk:8-jdk-alpine VOLUME /tmp ARG PROFILE_ENV +ENV profile_env=$PROFILE_ENV ARG JAR_FILE ADD ${JAR_FILE} app.jar RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=${PROFILE_ENV}","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Dspring.cloud.config.profile=$profile_env","-jar","-Xms200M","-Xmx512M","/app.jar"] \ No newline at end of file