Merge branch 'preview' into feature/test-pipeline

.gitea/workflows/deployment.yml

@@ -24,7 +24,7 @@ jobs:
       docker_folder_changed: ${{ steps.docker_folder.outputs.changed }}
     steps:
       - name: Checkout Repository
-        run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
+        run: git clone --branch preview https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
 
       - name: Check Latest Hugo Version
         id: get_latest
@@ -79,7 +79,7 @@ jobs:
         shell: sh
     steps:
       - name: Checkout Repository
-        run: git clone --branch ${{ gitea.ref_name }} https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
+        run: git clone --branch preview https://${{ secrets.REPO_TOKEN }}@git.vezpi.com/Vezpi/blog.git .
 
       - name: Build Docker Image
         run: |  
@@ -116,7 +116,7 @@ jobs:
     needs: Deploy-Staging
     runs-on: ubuntu
     env:
-      URL: "https://blog-staging.vezpi.com/en/"
+      URL: "https://blog-dev.vezpi.com/en/"
     steps:
       - name: Check HTTP Response
         run: |
@@ -143,7 +143,7 @@ jobs:
       
       - name: Merge preview Branch on main
         run: |
-          git merge --ff-only origin/${{ gitea.ref_name }}
+          git merge --ff-only origin/preview
           git push origin main
 
   Deploy-Production:
@@ -194,7 +194,7 @@ jobs:
     steps:
       - name: Remove Old Docker Image
         run: |
-          docker image rm $(docker image ls ${DOCKER_IMAGE} 2> /dev/null | awk '$NF != "U" && NR>1 {print $2}')
+          docker image rm ${{ needs.Check-Rebuild.outputs.current_docker_image }} --force
   
   Notify:
     needs: [Check-Rebuild, Build, Deploy-Staging, Test-Staging, Merge, Deploy-Production, Test-Production, Clean]

.gitea/workflows/test.yml

@@ -87,7 +87,7 @@ jobs:
             --build-arg HUGO_VERSION=${{ needs.Check-Rebuild.outputs.latest_hugo_version }} \
             --tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} \
             .
-          docker tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} ${DOCKER_IMAGE}:dev
+          docker tag ${DOCKER_IMAGE}:${{ needs.Check-Rebuild.outputs.latest_hugo_version }} ${DOCKER_IMAGE}:test
 
   Deploy-Test:
     needs:
@@ -102,7 +102,7 @@ jobs:
       run:
         shell: sh
     env:
-      CONTAINER_NAME: blog_dev
+      CONTAINER_NAME: blog_test
     steps:
       - name: Launch Blog Test Deployment
         run: |
@@ -117,7 +117,7 @@ jobs:
     needs: Deploy-Test
     runs-on: ubuntu
     env:
-      URL: "https://blog-dev.vezpi.com/en/"
+      URL: "https://blog-test.vezpi.com/en/"
     steps:
       - name: Check HTTP Response
         run: |

layouts/partials/article/components/details.html

@@ -7,7 +7,7 @@
             {{ $color := partial "helper/color-from-str" .LinkTitle }}
             {{ $BackgroundColor := default $color.BackgroundColor .Params.style.background }}
             {{ $TextColor := default $color.TextColor .Params.style.color }}
-            <a href="{{ $Page.RelPermalink }}" style="background-color: {{ $BackgroundColor | safeCSS }}; color: {{ $TextColor | safeCSS }};">
+            <a href="{{ .RelPermalink }}" style="background-color: {{ $BackgroundColor | safeCSS }}; color: {{ $TextColor | safeCSS }};">
                 {{ .LinkTitle }}
             </a>
         {{ end }}
@@ -16,7 +16,7 @@
 
     <div class="article-title-wrapper">
         <h2 class="article-title">
-            <a href="{{ $Page.RelPermalink }}">
+            <a href="{{ .RelPermalink }}">
                 {{- $Page.Title -}}
             </a>
         </h2>