Merge branch 'dev-8283' into dev-8283-test

# Conflicts: # .github/workflows/publish-helm-chart.yaml
FrommyMind · Dec 16, 2024 · bfccfdc · bfccfdc
2 parents 1ac50d5 + 6d31758
commit bfccfdc
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/.github/workflows/publish-helm-chart.yaml b/.github/workflows/publish-helm-chart.yaml
@@ -27,6 +27,8 @@ on:
 env:
   DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USER }}
   DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
+  DOCKER_REGISTRY: docker.io
+  HUB: registry-1.docker.io/duanfangwei
 
 jobs:
   build:
@@ -38,12 +40,6 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - name: Set environment variables
-        run: |
-            echo "HUB=registry-1.docker.io/duanfangwei" >> $GITHUB_ENV
-            echo "DOCKER_REGISTRY=docker.io" >> $GITHUB_ENV
-            echo "DOCKER_USERNAME=${{ env.DOCKER_USERNAME }}" >> $GITHUB_ENV
-            echo "DOCKER_PASSWORD=${{ env.DOCKER_PASSWORD }}" >> $GITHUB_ENV
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with: