diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 4f788a901..8f78b6d29 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -48,6 +48,7 @@ jobs: fi echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \ --build-arg DOCKER_IMAGE_TAG=${{ github.event.inputs.dockerImageTag }} --build-arg BUILD_AT=$(TZ=Asia/Shanghai date +'%Y-%m-%dT%H:%M') --build-arg GITHUB_COMMIT=${GITHUB_SHA::8} --no-cache \ + --build-arg FIT2CLOUD_MAVEN_USERNAME=${{ secrets.FIT2CLOUD_MAVEN_USERNAME }} --build-arg FIT2CLOUD_MAVEN_PASSWORD=${{ secrets.FIT2CLOUD_MAVEN_PASSWORD }} \ ${DOCKER_IMAGE_TAGS} . - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/installer/Dockerfile b/installer/Dockerfile index e979b6df9..2d794e6df 100644 --- a/installer/Dockerfile +++ b/installer/Dockerfile @@ -7,7 +7,6 @@ RUN npm install -g pnpm && \ pnpm run build - FROM eclipse-temurin:21-jdk AS build WORKDIR /build COPY . /build @@ -19,6 +18,23 @@ RUN ./mvnw clean package -DskipTests -pl '!frontend' && \ jar -xf ../*.jar +RUN VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) && \ + echo "Using version: $VERSION" + +ARG FIT2CLOUD_MAVEN_USERNAME +ARG FIT2CLOUD_MAVEN_PASSWORD + +RUN ./mvnw deploy:deploy-file \ + -Dfile=backend/crm/target/crm-${VERSION}.jar \ + -DrepositoryId=cordys-public \ + -Durl=https://repository.fit2cloud.com/repository/cordys/ \ + -DgroupId=io.cordys \ + -DartifactId=cordys-crm \ + -Dversion=${VERSION} \ + -Dpackaging=jar \ + -Dusername=${FIT2CLOUD_MAVEN_USERNAME} \ + -Dpassword=${FIT2CLOUD_MAVEN_PASSWORD} + FROM ghcr.io/cordys-dev/cordys-base