From 26e3061ab8a3d191e0de367b3bb0a0ac5c2dd290 Mon Sep 17 00:00:00 2001
From: Yikun Jiang <yikunkero@gmail.com>
Date: Tue, 11 Oct 2022 10:55:04 +0800
Subject: [PATCH] Fix docker image build workflow

---
 .github/workflows/build_3.3.0.yaml | 4 +++-
 .github/workflows/main.yml         | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_3.3.0.yaml b/.github/workflows/build_3.3.0.yaml
index 63b1ab3..372286a 100644
--- a/.github/workflows/build_3.3.0.yaml
+++ b/.github/workflows/build_3.3.0.yaml
@@ -24,11 +24,13 @@ on:
     branches:
       - 'master'
     paths:
-      - '3.3.0/'
+      - '3.3.0/**'
       - '.github/workflows/main.yml'
 
 jobs:
   run-build:
+    permissions:
+      packages: write
     name: Run
     secrets: inherit
     uses: ./.github/workflows/main.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 90bd706..a9614fd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,6 +41,8 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
+    permissions:
+      packages: write
     strategy:
       matrix:
         spark_version:
@@ -71,7 +73,7 @@ jobs:
         run: |
           TAG=scala${{ matrix.scala_version }}-java${{ matrix.java_version }}-${{ matrix.image_suffix }}
 
-          REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          REPO_OWNER=$(echo "${{ github.actor }}" | tr '[:upper:]' '[:lower:]')
           TEST_REPO=ghcr.io/$REPO_OWNER/spark-docker
           IMAGE_NAME=spark
           IMAGE_PATH=${{ matrix.spark_version }}/$TAG
@@ -98,7 +100,7 @@ jobs:
         with:
           context: ${{ env.IMAGE_PATH }}
           push: true
-          tags: ${{ env.TEST_REPO }}:${{ env.UNIQUE_IMAGE_TAG }}
+          tags: ${{ env.TEST_REPO }}/${{ env.IMAGE_NAME }}:${{ env.UNIQUE_IMAGE_TAG }}
           platforms: linux/amd64,linux/arm64
 
       - name: Image digest