diff --git a/.github/workflows/build-php.yml b/.github/workflows/build-php.yml index 4ff8e0a..cd2ec13 100644 --- a/.github/workflows/build-php.yml +++ b/.github/workflows/build-php.yml @@ -43,21 +43,21 @@ jobs: id: buildx uses: docker/setup-buildx-action@v3.1.0 - name: Build and Push by digest (runtime) - uses: Ilyes512/github-actions/build-target@1.0.11 + uses: Ilyes512/github-actions/build-target@1.0.12 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} dockerfile: ${{ inputs.dockerfile }} target: runtime - name: Build and Push by digest (builder) - uses: Ilyes512/github-actions/build-target@1.0.11 + uses: Ilyes512/github-actions/build-target@1.0.12 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} dockerfile: ${{ inputs.dockerfile }} target: builder - name: Build and Push by digest (builder_nodejs) - uses: Ilyes512/github-actions/build-target@1.0.11 + uses: Ilyes512/github-actions/build-target@1.0.12 with: platform: ${{ inputs.platform }} image-name: ${{ steps.image_name.outputs.lowercase }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7056d78..1d9a666 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: with: string: ${{ inputs.image-name }} - name: Build and Push by digest - uses: Ilyes512/github-actions/build-image@1.0.11 + uses: Ilyes512/github-actions/build-image@1.0.12 with: dockerfile: ${{ inputs.dockerfile }} platform: ${{ inputs.platform }} diff --git a/.github/workflows/merge-php.yml b/.github/workflows/merge-php.yml index 08f6aeb..d3fadfa 100644 --- a/.github/workflows/merge-php.yml +++ b/.github/workflows/merge-php.yml @@ -59,21 +59,21 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create Manifest (runtime) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.11 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.12 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: runtime description: ${{ inputs.description-runtime }} title: ${{ inputs.title-runtime }} - name: Create Manifest (builder) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.11 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.12 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder description: ${{ inputs.description-builder }} title: ${{ inputs.title-builder }} - name: Create Manifest (builder_nodejs) - uses: Ilyes512/github-actions/create-manifest-for-target@1.0.11 + uses: Ilyes512/github-actions/create-manifest-for-target@1.0.12 with: image-name: ${{ steps.image_name.outputs.lowercase }} target: builder_nodejs diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 7b20bf2..a9cdc36 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -42,7 +42,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Create Manifest - uses: Ilyes512/github-actions/create-manifest@1.0.11 + uses: Ilyes512/github-actions/create-manifest@1.0.12 with: image-name: ${{ steps.image_name.outputs.lowercase }} title: ${{ inputs.title }} diff --git a/build-image/action.yml b/build-image/action.yml index 4987e18..6abd734 100644 --- a/build-image/action.yml +++ b/build-image/action.yml @@ -39,6 +39,9 @@ runs: labels: | ${{ inputs.title != '' && format('org.opencontainers.image.title={0}', inputs.title) || '' }} ${{ inputs.description != '' && format('org.opencontainers.image.description={0}', inputs.description) || '' }} + annotations: | + ${{ inputs.title != '' && format('org.opencontainers.image.title={0}', inputs.title) || '' }} + ${{ inputs.description != '' && format('org.opencontainers.image.description={0}', inputs.description) || '' }} - name: Build and push by digest id: build uses: docker/build-push-action@v5 @@ -48,6 +51,7 @@ runs: file: ${{ inputs.dockerfile}} platforms: ${{ inputs.platform }} labels: ${{ steps.meta.outputs.labels }} + annotations: ${{ steps.meta.outputs.annotations }} provenance: false outputs: type=image,name=${{ inputs.image-name }},push-by-digest=true,name-canonical=true,oci-mediatypes=true cache-from: type=gha,scope=${{ inputs.dockerfile }}-${{ env.PLATFORM_PAIR }} diff --git a/build-target/action.yml b/build-target/action.yml index 5915aca..deffec3 100644 --- a/build-target/action.yml +++ b/build-target/action.yml @@ -46,6 +46,9 @@ runs: labels: | ${{ inputs.title != '' && format('org.opencontainers.image.title={0}', inputs.title) || '' }} ${{ inputs.description != '' && format('org.opencontainers.image.description={0}', inputs.description) || '' }} + annotations: | + ${{ inputs.title != '' && format('org.opencontainers.image.title={0}', inputs.title) || '' }} + ${{ inputs.description != '' && format('org.opencontainers.image.description={0}', inputs.description) || '' }} - name: Build and push by digest (${{ inputs.target }}) id: build uses: docker/build-push-action@v5 @@ -56,6 +59,7 @@ runs: platforms: ${{ inputs.platform }} target: ${{ inputs.target }} labels: ${{ steps.meta.outputs.labels }} + annotations: ${{ steps.meta.outputs.annotations }} provenance: false outputs: type=image,name=${{ inputs.image-name }},push-by-digest=true,name-canonical=true,oci-mediatypes=true cache-from: type=gha,scope=${{ inputs.dockerfile }}-${{ env.PLATFORM_PAIR }}-${{ inputs.target }}