From 6f1fdc7eb3849c6ca892a8718075efa0f70245b2 Mon Sep 17 00:00:00 2001 From: danilapog Date: Tue, 7 Jun 2022 11:11:37 +0300 Subject: [PATCH] Cosmetic changes --- .github/workflows/build-4testing.yml | 2 +- .github/workflows/build-stable.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-4testing.yml b/.github/workflows/build-4testing.yml index 2ff71fe..1fe16fa 100644 --- a/.github/workflows/build-4testing.yml +++ b/.github/workflows/build-4testing.yml @@ -40,7 +40,7 @@ jobs: run: | echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/} - - name: Build multi-arch documentserver image + - name: Build documentserver-4testing run: | PACKAGE_URL=http://download.onlyoffice.com/install/documentserver/linux/onlyoffice-documentserver${{ matrix.edition }}_amd64.deb STATUS=$(curl -s -o /dev/null -w "%{http_code}\n" "$PACKAGE_URL") diff --git a/.github/workflows/build-stable.yml b/.github/workflows/build-stable.yml index 67a0821..16059a5 100644 --- a/.github/workflows/build-stable.yml +++ b/.github/workflows/build-stable.yml @@ -39,15 +39,15 @@ jobs: run: | echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/} - - name: Build Community-Edition + - name: Build documentserver-stable run: | DOCKER_TAG=$(echo ${{ steps.tag_name.outputs.SOURCE_TAG }} | sed 's/^.//; s/-stable//') IMAGE_STATUS=$(docker manifest inspect ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$DOCKER_TAG > /dev/null ; echo $?) if [[ "$IMAGE_STATUS" = "0" ]]; then echo "Image present on docker.hub >> start build stable version" echo "FROM ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$DOCKER_TAG as ${{ env.PRODUCT_NAME }}-stable" >> Dockerfile.stable - PRODUCT_EDITION=${{ matrix.edition }} PRODUCT_NAME=${{ env.PRODUCT_NAME }} COMPANY_NAME=${{ env.COMPANY_NAME}} \ - DOCKERFILE=Dockerfile.stable TAG=$DOCKER_TAG \ + PRODUCT_EDITION=${{ matrix.edition }} PRODUCT_NAME=${{ env.PRODUCT_NAME }} \ + COMPANY_NAME=${{ env.COMPANY_NAME}} DOCKERFILE=Dockerfile.stable TAG=$DOCKER_TAG \ docker buildx bake \ -f docker-bake.hcl ${{ matrix.images }} \ --push ;