fix secrets

WattRex · Dec 14, 2023 · 05fadf5 · 05fadf5
1 parent 082f2c9
commit 05fadf5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/deploy_development.yml b/.github/workflows/deploy_development.yml
@@ -60,20 +60,20 @@ jobs:
     name: Publish mn-manager docker image
     needs: publish-package
     uses: ./.github/workflows/docker_image.yml
+    secrets: inherit
     with:
       dockerfile-path: ./devops/mn_manager/Dockerfile.mn_manager
       docker-repo-name: wattrex-mn-manager-dev
       is-develop: true
-      docker-user: ${{ secrets.DOCKER_USERNAME_JAVI }}
-      docker-pass: ${{ secrets.DOCKER_PASSWORD_JAVI }}
+      docker-user: ${{ vars.DOCKER_USERNAME_JAVI }}
 
   publish-DEV-docker-image-web-server:
     name: Publish web-server docker image
     if: ${{ github.event_name == 'pull_request_review' && github.event.review.state == 'approved' && github.event.pull_request.head.ref == 'web_server'}}
     uses: ./.github/workflows/docker_image.yml
+    secrets: inherit
     with:
       dockerfile-path: ./devops/web_server/Dockerfile.web_server
       docker-repo-name: wattrex-web-server-dev
       is-develop: true
-      docker-user: ${{ secrets.DOCKER_USERNAME_JAVI }}
-      docker-pass: ${{ secrets.DOCKER_PASSWORD_JAVI }}
+      docker-user: ${{ vars.DOCKER_USERNAME_JAVI }}
diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
@@ -8,6 +8,7 @@ on:
         required: true
         type: string
 
+
       docker-repo-name:
         description: Name of docker hub repository used to push the image
         required: true
@@ -24,10 +25,10 @@ on:
         required: true
         type: string
 
-      docker-pass:
+    secrets:
+      DOCKER_PASSWORD_JAVI:
         description: Docker hub password
         required: true
-        type: string
 
 jobs:
   push_to_registry:
@@ -41,7 +42,7 @@ jobs:
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ inputs.docker-user }}
-          password: ${{ inputs.docker-pass }}
+          password: ${{ secrets.DOCKER_PASSWORD_JAVI }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta