diff --git a/.gitea/workflows/build-and-deploy.yaml b/.gitea/workflows/build-and-deploy.yaml index ac90af7..e1d2dbd 100644 --- a/.gitea/workflows/build-and-deploy.yaml +++ b/.gitea/workflows/build-and-deploy.yaml @@ -29,6 +29,7 @@ on: env: REGISTRY_HOST: git.dwal.in IMAGE_NAME: zola-pwsh-s3 + IMAGE_TAG: v2 # Increment this when you rebuild the container to bypass cache TEMPLATES_REPO_URL: ${{ vars.TEMPLATES_REPO_URL }} SCRIPTS_REPO_URL: ${{ vars.SCRIPTS_REPO_URL }} S3_ENDPOINT: ${{ vars.S3_ENDPOINT }} @@ -40,7 +41,9 @@ jobs: # Use custom container with PowerShell, Zola, AWS CLI, Git pre-installed # Built by build-container.yaml workflow from integrations/gitea/Dockerfile container: - image: ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}/${{ env.IMAGE_NAME }}:latest + # Using version tag to bypass cache issues + # Increment IMAGE_TAG in env when rebuilding container + image: ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} credentials: username: ${{ gitea.actor }} password: ${{ secrets.CONTAINER_TOKEN }} diff --git a/.gitea/workflows/build-container.yaml b/.gitea/workflows/build-container.yaml index 137f1fa..9ba747a 100644 --- a/.gitea/workflows/build-container.yaml +++ b/.gitea/workflows/build-container.yaml @@ -24,6 +24,7 @@ on: env: IMAGE_NAME: zola-pwsh-s3 + IMAGE_TAG: v2 # Increment this to force new image builds REGISTRY_HOST: git.dwal.in jobs: @@ -51,6 +52,7 @@ jobs: images: ${{ env.REGISTRY_HOST }}/${{ gitea.repository }}/${{ env.IMAGE_NAME }} tags: | type=raw,value=latest + type=raw,value=${{ env.IMAGE_TAG }} type=sha,prefix= - name: Build and push container image