Merge pull request #16 from AndrewChubatiuk/frontend-build

Frontend build
AndrewChubatiuk · Mar 9, 2024 · f2cabc4 · f2cabc4
2 parents 1728eee + 51f64d5
commit f2cabc4
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/.github/workflows/preview-image.yml b/.github/workflows/preview-image.yml
@@ -9,8 +9,8 @@ on:
       - master
 
 env:
-  DOCKER_REPOSITORY: achubatiuk/redash
-  PREVIEW_DOCKER_REPOSITORY: achubatiuk/preview
+  DOCKER_REPO: redash/redash
+  PREVIEW_DOCKER_REPO: redash/preview
 
 jobs:
   build-skip-check:
@@ -70,13 +70,19 @@ jobs:
         run: |
           set -x
           VERSION=$(jq -r .version package.json)
-          FULL_VERSION=${VERSION}+b${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}
+          FULL_VERSION=${VERSION}-b${GITHUB_RUN_ID}.${GITHUB_RUN_NUMBER}
           sed -ri "s/^__version__ = ([A-Za-z0-9.-]*)'/__version__ = '${FULL_VERSION}'/" redash/__init__.py
           sed -i "s/dev/${GITHUB_SHA}/" client/app/version.json
           echo "VERSION_TAG=$FULL_VERSION" >> "$GITHUB_OUTPUT"
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
           echo "SCOPE=${platform//\//-}" >> $GITHUB_ENV
+          if [[ "${{ vars.DOCKER_REPO }}" != "" ]]; then
+            echo "DOCKER_REPO=${{ vars.DOCKER_REPO }}" >> $GITHUB_ENV
+          fi
+          if [[ "${{ vars.PREVIEW_DOCKER_REPO }}" != "" ]]; then
+            echo "PREVIEW_DOCKER_REPO=${{ vars.PREVIEW_DOCKER_REPO }}" >> $GITHUB_ENV
+          fi
       - name: Build and push preview image to Docker Hub
         uses: docker/build-push-action@v5
         id: build
@@ -86,7 +92,7 @@ jobs:
           cache-from: type=gha,scope=${{ env.SCOPE }}
           cache-to: type=gha,mode=max,scope=${{ env.SCOPE }}
           platforms: ${{ matrix.platform }}
-          outputs: type=image,name=${{ env.DOCKER_REPOSITORY }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=image,name=${{ env.DOCKER_REPO }},push-by-digest=true,name-canonical=true,push=true
           build-args: |
             FRONTEND_BUILD_MODE=1
         env:
@@ -123,7 +129,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.DOCKER_REPOSITORY }}
+          images: ${{ env.DOCKER_REPO }}
           tags: preview
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -134,12 +140,12 @@ jobs:
         working-directory: /tmp/digests
         run: |
           docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-          $(printf '${{ env.DOCKER_REPOSITORY }}@sha256:%s ' *)
+          $(printf '${{ env.DOCKER_REPO }}@sha256:%s ' *)
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.DOCKER_REPOSITORY }}:${{ steps.meta.outputs.version }}
-      - name: Push image ${{ env.PREVIEW_DOCKER_REPOSITORY }} image
+          docker buildx imagetools inspect ${{ env.DOCKER_REPO }}:${{ steps.meta.outputs.version }}
+      - name: Push image ${{ env.PREVIEW_DOCKER_REPO }} image
         run: |
           docker buildx imagetools create \
-            --tag ${{ env.PREVIEW_DOCKER_REPOSITORY }}:${{ needs.build-docker-image.outputs.version }} \
-            ${{ env.DOCKER_REPOSITORY }}:preview
+            --tag ${{ env.PREVIEW_DOCKER_REPO }}:${{ needs.build-docker-image.outputs.version }} \
+            ${{ env.DOCKER_REPO }}:preview