From c8be691c224ab68aaf78a0a037297006d00bf92e Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Fri, 4 Aug 2023 15:49:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f012405..f66db29c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,4 @@ WORKDIR /app ARG JAR_FILE=target/*.jar COPY --from=build /code/target/*.jar app.jar COPY GeoLite2-City . -ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /app.jar ${0} ${@}"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar app.jar ${0} ${@}"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index ee3b86de..b64019c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline{ steps{ - sh "docker-compose --project-name ${env.JOB_NAME} --project-directory docker/${env.BRANCH_NAME} -d up" + sh "docker-compose --project-name ${env.JOB_NAME.replace('-', '')} --project-directory docker/${env.BRANCH_NAME} -d up" }