From 2c91ee09b973b1b0eabc3f8bb29b3d0f23505efe Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 7 Feb 2025 12:43:49 +0800 Subject: [PATCH] ci: Modify the variable transmission --- .github/workflows/build-and-push.yml | 2 +- installer/Dockerfile | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 545736b4f..ac50d9514 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -7,7 +7,7 @@ on: inputs: dockerImageTag: description: 'Docker Image Tag' - default: 'v1.0.x' + default: 'v1.0.0-dev' required: true architecture: description: 'Architecture' diff --git a/installer/Dockerfile b/installer/Dockerfile index 3a0f3fc8c..a00757aa1 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -12,7 +12,10 @@ WORKDIR /build COPY . /build COPY --from=frontend /frontend/packages/web/dist /build/frontend/packages/web/dist COPY --from=frontend /frontend/packages/mobile/dist /build/frontend/packages/mobile/dist -RUN ./mvnw clean package -DskipTests -pl '!frontend' && \ + +RUN JAR_VERSION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout) && \ + echo "Using Jar version: $JAR_VERSION" && \ + ./mvnw clean package -DskipTests -pl '!frontend' && \ mkdir backend/app/target/dependency && \ cd backend/app/target/dependency && \ jar -xf ../*.jar @@ -26,12 +29,12 @@ ENV FIT2CLOUD_MAVEN_PASSWORD=${FIT2CLOUD_MAVEN_PASSWORD} ENV CRM_VERSION=${CRM_VERSION} RUN ./mvnw deploy:deploy-file \ - -Dfile=backend/crm/target/crm-${CRM_VERSION}.jar \ + -Dfile=backend/crm/target/crm-${JAR_VERSION}.jar \ -DrepositoryId=cordys-public \ -Durl=https://repository.fit2cloud.com/repository/cordys/ \ -DgroupId=io.cordys \ -DartifactId=cordys-crm \ - -Dversion=${CRM_VERSION} \ + -Dversion=${JAR_VERSION} \ -Dpackaging=jar \ -Dusername=${FIT2CLOUD_MAVEN_USERNAME} \ -Dpassword=${FIT2CLOUD_MAVEN_PASSWORD}