Merge pull request #7 from cupofpython/troubleshootlogin

Troubleshootlogin

Author: cupofpython

.github/workflows/build-and-push.yml

@@ -2,13 +2,18 @@ name: Build and deploy image
 
 on:
   workflow_call:
+    secrets:
+      DOCKERHUB_TOKEN:
+        required: true
     inputs:
       IMAGE_TAG:
         required: true
         type: string
 
 env:
   IMAGE_NAME: samanthamorris684/catbot
+  USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
+  PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
 jobs:
   build-and-push-image:
@@ -20,14 +25,14 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/[email protected]
         with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ env.USERNAME }}
+          password: ${{ env.PASSWORD }}
 
       - uses: actions/checkout@v4
       - name: Build and push the Docker image
         run: |
-          - docker build -t $IMAGE_NAME:$TAG .
-          - docker push $IMAGE_NAME:$TAG
+          docker build -t $IMAGE_NAME:${{ inputs.IMAGE_TAG }} .
+          docker push $IMAGE_NAME:${{ inputs.IMAGE_TAG }}
 
         
         

.github/workflows/feature-branch.yml

@@ -8,6 +8,8 @@ jobs:
   build-and-push-feature:
     uses: ./.github/workflows/build-and-push.yml
     with:
-        IMAGE_TAG: $GITHUB_REF_NAME
+      IMAGE_TAG: $GITHUB_REF_NAME
+    secrets:
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} 
 
 

.github/workflows/main-branch.yml

@@ -8,5 +8,7 @@ jobs:
   build-and-push-main:
     uses: ./.github/workflows/build-and-push.yml
     with:
-        IMAGE_TAG: main@$GITHUB_SHA
+      IMAGE_TAG: main@$GITHUB_SHA
+    secrets:
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} 
 

.github/workflows/release.yml

@@ -0,0 +1,13 @@
+name: Create release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  update-cluster:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update cluster
+        run: helm upgrade --set image.tag=<newtag>
+