From bce224c2224fe16e849d74a9a731c24c2f490c12 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 14 Aug 2024 09:23:39 +0800 Subject: [PATCH] 'build --- .drone.yml | 11 +++++++---- ludu-job-admin/ludu-job-admin-biz/Dockerfile | 5 +++-- .../ludu-module-datacenter-biz/Dockerfile | 5 +++-- .../ludu-module-parking-biz/Dockerfile | 5 +++-- .../ludu-module-ticketing-biz/Dockerfile | 5 +++-- yudao-gateway/Dockerfile | 1 + yudao-module-infra/yudao-module-infra-biz/Dockerfile | 5 +++-- .../yudao-module-system-biz/Dockerfile | 5 +++-- 8 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index d343683c4..9f2a18d38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -79,6 +79,12 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 command_timeout: 5m # 远程执行命令超时时间 script: + - echo "start copy" + - scp -r /ludu/maven/build/ludu-module-ticketing root@120.46.37.243:/ludu/maven/build + - scp -r /ludu/maven/build/ludu-module-parking root@120.46.37.243:/ludu/maven/build + - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build + + - echo "start run.sh" - cd /ludu/maven/build/yudao-gateway/ - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行 @@ -95,10 +101,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行 - - echo "start copy" - - scp -r /ludu/maven/build/ludu-module-ticketing root@120.46.37.243:/ludu/maven/build - - scp -r /ludu/maven/build/ludu-module-parking root@120.46.37.243:/ludu/maven/build - - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build + - name: build-other-service diff --git a/ludu-job-admin/ludu-job-admin-biz/Dockerfile b/ludu-job-admin/ludu-job-admin-biz/Dockerfile index 0cc14c40a..7a551a98b 100644 --- a/ludu-job-admin/ludu-job-admin-biz/Dockerfile +++ b/ludu-job-admin/ludu-job-admin-biz/Dockerfile @@ -9,11 +9,12 @@ WORKDIR /ludu-job-admin-biz COPY ./target/ludu-job-admin-biz.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 9090 端口 EXPOSE 9090 ## 启动后端项目 -CMD java ${JAVA_OPTS} app.jar +CMD java ${JAVA_OPTS} -jar app.jar diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile b/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile index d600d5ba1..27689820a 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile @@ -9,11 +9,12 @@ WORKDIR /ludu-module-datacenter-biz COPY ./target/ludu-module-datacenter-biz.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48092 端口 EXPOSE 48092 ## 启动后端项目 -CMD java ${JAVA_OPTS} app.jar \ No newline at end of file +CMD java ${JAVA_OPTS} -jar app.jar \ No newline at end of file diff --git a/ludu-module-parking/ludu-module-parking-biz/Dockerfile b/ludu-module-parking/ludu-module-parking-biz/Dockerfile index 14cd9493b..de9f365d2 100644 --- a/ludu-module-parking/ludu-module-parking-biz/Dockerfile +++ b/ludu-module-parking/ludu-module-parking-biz/Dockerfile @@ -9,11 +9,12 @@ WORKDIR /ludu-module-parking-biz COPY ./target/ludu-module-parking-biz.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48090 端口 EXPOSE 48090 ## 启动后端项目 -CMD java ${JAVA_OPTS} app.jar +CMD java ${JAVA_OPTS} -jar app.jar diff --git a/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile b/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile index d7a1e951a..633326843 100644 --- a/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile +++ b/ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile @@ -9,11 +9,12 @@ WORKDIR /ludu-module-ticketing-biz COPY ./target/ludu-module-ticketing-biz.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48088 端口 EXPOSE 48088 ## 启动后端项目 -CMD java ${JAVA_OPTS} app.jar +CMD java ${JAVA_OPTS} -jar app.jar diff --git a/yudao-gateway/Dockerfile b/yudao-gateway/Dockerfile index 585e29f5d..64c26a1ea 100644 --- a/yudao-gateway/Dockerfile +++ b/yudao-gateway/Dockerfile @@ -7,6 +7,7 @@ WORKDIR /yudao-gateway ADD ./target/yudao-gateway.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" diff --git a/yudao-module-infra/yudao-module-infra-biz/Dockerfile b/yudao-module-infra/yudao-module-infra-biz/Dockerfile index 70e9fb9d7..756ace135 100644 --- a/yudao-module-infra/yudao-module-infra-biz/Dockerfile +++ b/yudao-module-infra/yudao-module-infra-biz/Dockerfile @@ -9,11 +9,12 @@ WORKDIR /yudao-module-infra-biz COPY ./target/yudao-module-infra-biz.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48082 端口 EXPOSE 48082 ## 启动后端项目 -CMD java ${JAVA_OPTS} app.jar +CMD java ${JAVA_OPTS} -jar app.jar diff --git a/yudao-module-system/yudao-module-system-biz/Dockerfile b/yudao-module-system/yudao-module-system-biz/Dockerfile index 7c8e35223..64d05042d 100644 --- a/yudao-module-system/yudao-module-system-biz/Dockerfile +++ b/yudao-module-system/yudao-module-system-biz/Dockerfile @@ -9,11 +9,12 @@ WORKDIR /yudao-module-system-biz COPY ./target/yudao-module-system-biz.jar app.jar ## 设置 TZ 时区 +ENV TZ=Asia/Shanghai ## 设置 JAVA_OPTS 环境变量，可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV JAVA_OPTS="-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom" ## 暴露后端项目的 48081 端口 EXPOSE 48081 ## 启动后端项目 -CMD java ${JAVA_OPTS} app.jar +CMD java ${JAVA_OPTS} -jar app.jar