update image tag

fullstackjam · Jan 29, 2024 · d882a3a · d882a3a
1 parent 4579cd2
commit d882a3a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -20,24 +20,22 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: fullstackjam/flask-watchlist
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+
+      - name: Set Short SHA
+        run: echo "SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
+
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./Dockerfile
+          file: Dockerfile
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: |
+            fullstackjam/flask-watchlist:${{ env.SHORT_SHA }}
+            fullstackjam/flask-watchlist:latest
diff --git a/helm/flask-watchlist/templates/deployment.yaml b/helm/flask-watchlist/templates/deployment.yaml
@@ -14,7 +14,8 @@ spec:
     spec:
       containers:
       - name: flask-watchlist-container
-        image: fullstackjam/flask-watchlist:master
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: 5000
       imagePullSecrets:

diff --git a/helm/flask-watchlist/templates/ingressroute.yaml b/helm/flask-watchlist/templates/ingressroute.yaml
@@ -6,7 +6,7 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: Host(`{{ .Values.host }}`)
+    - match: Host(`{{ .Values.domain }}`)
       kind: Rule
       services:
         - name: flask-watchlist-service

diff --git a/helm/flask-watchlist/values.yaml b/helm/flask-watchlist/values.yaml
@@ -1 +1,6 @@
-host: "flask-watchlist.fullstackjam.com"
+image:
+  repository: fullstackjam/flask-watchlist
+  pullPolicy: Always
+  tag: latest
+
+domain: "flask-watchlist.fullstackjam.com"