From b57a65e0d37579b8a6472de9c75f30db718eeeb2 Mon Sep 17 00:00:00 2001 From: ls Date: Fri, 11 Oct 2024 23:54:31 +0800 Subject: [PATCH] update --- .gitlab-ci.yml | 2 +- Dockerfile | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4179669..2223eff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml stages: # List of stages for jobs, and their order of execution -# - build + - build - deploy build-job: # This job runs in the build stage, which runs first. diff --git a/Dockerfile b/Dockerfile index 30c8056..7b51fdb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ #FROM bellsoft/liberica-openjdk-debian:17 -FROM maven:3.9.8-eclipse-temurin-17 AS build - -WORKDIR /app - -COPY settings.xml /root/.m2/settings.xml - -ADD . /app -RUN mvn package -DskipTests=true clean install +#FROM maven:3.9.8-eclipse-temurin-17 AS build +# +#WORKDIR /app +# +#COPY settings.xml /root/.m2/settings.xml +# +#ADD . /app +#RUN mvn package -DskipTests=true clean install @@ -17,6 +17,7 @@ WORKDIR /app EXPOSE 8080 #ADD ./src/main/resources/jeecg ./config/jeecg -COPY --from=build /app/physical-launcher/target/physical-launcher-3.7.0.jar physical-launcher-3.7.0.jar +#COPY --from=build /app/physical-launcher/target/physical-launcher-3.7.0.jar physical-launcher-3.7.0.jar +COPY ./physical-launcher/target/physical-launcher-3.7.0.jar physical-launcher-3.7.0.jar CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar physical-launcher-3.7.0.jar --spring.profiles.active=prod \ No newline at end of file