Update default.yaml - users env

nguoianphu · Jul 16, 2023 · 523a90f · 523a90f
1 parent d9d2b66
commit 523a90f
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
@@ -9,17 +9,18 @@ on:
       - v*
 
 env:
-  DH_IMAGE_BASE_NAME: ${{ secrets.DOCKERHUB_USER }}/alpine-android-base
-  DH_IMAGE_NAME: ${{ secrets.DOCKERHUB_USER }}/alpine-android
+  DOCKERHUB_USER: ${{ github.repository_owner }}
+  GITHUB_USER: ${{ github.repository_owner }}
+  QUAY_USER: ${{ github.repository_owner }}
+
+  DH_IMAGE_BASE_NAME: ${{ env.DOCKERHUB_USER }}/alpine-android-base
+  DH_IMAGE_NAME: ${{ env.DOCKERHUB_USER }}/alpine-android
 
-  GHCR_IMAGE_BASE_NAME: ${{ github.repository_owner }}/alpine-android-base
-  GHCR_IMAGE_NAME: ${{ github.repository_owner }}/alpine-android
+  GHCR_IMAGE_BASE_NAME: ${{ env.GITHUB_USER }}/alpine-android-base
+  GHCR_IMAGE_NAME: ${{ env.GITHUB_USER }}/alpine-android
 
-  QUAY_IMAGE_BASE_NAME: ${{ secrets.QUAY_USER }}/alpine-android-base
-  QUAY_IMAGE_NAME: ${{ secrets.QUAY_USER }}/alpine-android
-
-  DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-  QUAY_USER: ${{ secrets.QUAY_USER }}
+  QUAY_IMAGE_BASE_NAME: ${{ env.QUAY_USER }}/alpine-android-base
+  QUAY_IMAGE_NAME: ${{ env.QUAY_USER }}/alpine-android
 
   DEFAULT_JDK_VERSION: 11
   LATEST_STABLE_API: 33
@@ -72,15 +73,15 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USER }}
+          username: ${{ env.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASS }}
 
 #       - name: Login to GitHub Container Registry
 #         uses: docker/login-action@v2
 #         with:
 #           registry: ghcr.io
-#           username: ${{ github.repository_owner }}
-#           password: ${{ secrets.GHCR_PASS }}
+#           username: ${{ env.GITHUB_USER }}
+#           password: ${{ secrets.GITHUB_PASS }}
 
 #       - name: Login to Quay
 #         uses: docker/login-action@v2