Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.github/workflows/php-docker-public.yml

Author: tanhongit

.github/workflows/php-docker-public.yml

@@ -47,17 +47,6 @@ jobs:
           username: ${{ env.DOCKERHUB_USERNAME }}
           password: ${{ env.DOCKERHUB_TOKEN }}
 
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.DOCKERHUB_USERNAME }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
-
       - name: Get latest version tag
         id: get_version
         run: |
@@ -109,6 +98,7 @@ jobs:
             type=ref,event=tag
             type=semver,pattern={{version}}
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+            type=raw,value=${{ steps.inc_version.outputs.new_version }}
 
       - name: Build and push Docker image
         id: build-and-push