From b89fb5fd47174bf3e4f9138fd9341f38aaac97b9 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Fri, 8 Nov 2024 11:35:11 +0900 Subject: [PATCH 1/3] rename target-image and add descriptions Signed-off-by: Yutaka Kondo --- .../docker-build-and-push-cuda/action.yaml | 24 ++++---- .../actions/docker-build-and-push/action.yaml | 58 +++++++++---------- .github/actions/docker-build/action.yaml | 10 ++-- .../docker-build-and-push-arm64.yaml | 4 +- .github/workflows/docker-build-and-push.yaml | 4 +- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml index 59f5ccc3569..df1e7c00163 100644 --- a/.github/actions/docker-build-and-push-cuda/action.yaml +++ b/.github/actions/docker-build-and-push-cuda/action.yaml @@ -3,13 +3,13 @@ description: Workflow do build and push CUDA images to registry. inputs: platform: - description: "" + description: Target platform. required: true - bake-target: - description: "" + target-image: + description: Target docker image name in the registry. required: true build-args: - description: "" + description: Additional build args. required: false runs: @@ -55,11 +55,11 @@ runs: id: meta-universe-sensing-perception-devel-cuda uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-sensing-perception-devel-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-sensing-perception-devel-cuda + target-image: docker-metadata-action-universe-sensing-perception-devel-cuda flavor: | latest=false @@ -67,11 +67,11 @@ runs: id: meta-universe-sensing-perception-cuda uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-sensing-perception-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-sensing-perception-cuda + target-image: docker-metadata-action-universe-sensing-perception-cuda flavor: | latest=false @@ -79,11 +79,11 @@ runs: id: meta-universe-devel-cuda uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-devel-cuda-${{ inputs.platform }} type=raw,value=universe-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-devel-cuda + target-image: docker-metadata-action-universe-devel-cuda flavor: | latest=false @@ -91,11 +91,11 @@ runs: id: meta-universe-cuda uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-cuda-${{ inputs.platform }} type=raw,value=universe-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-cuda + target-image: docker-metadata-action-universe-cuda flavor: | latest=auto diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index 0a064ee1acf..58a70c0a36f 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -1,15 +1,15 @@ name: docker-build-and-push -description: "" +description: Workflow do build and push non CUDA images to registry. inputs: platform: - description: "" + description: Target platform. required: true - bake-target: - description: "" + target-image: + description: Target docker image name in the registry. required: true build-args: - description: "" + description: Additional build args. required: false runs: @@ -68,11 +68,11 @@ runs: id: meta-base uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=base-${{ inputs.platform }} type=raw,value=base-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-base + target-image: docker-metadata-action-base flavor: | latest=false @@ -80,11 +80,11 @@ runs: id: meta-core-devel uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=core-devel-${{ inputs.platform }} type=raw,value=core-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-core-devel + target-image: docker-metadata-action-core-devel flavor: | latest=false @@ -92,11 +92,11 @@ runs: id: meta-universe-sensing-perception-devel uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-sensing-perception-devel-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-sensing-perception-devel + target-image: docker-metadata-action-universe-sensing-perception-devel flavor: | latest=false @@ -104,11 +104,11 @@ runs: id: meta-universe-sensing-perception uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-sensing-perception-${{ inputs.platform }} type=raw,value=universe-sensing-perception-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-sensing-perception + target-image: docker-metadata-action-universe-sensing-perception flavor: | latest=false @@ -116,11 +116,11 @@ runs: id: meta-universe-localization-mapping-devel uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-localization-mapping-devel-${{ inputs.platform }} type=raw,value=universe-localization-mapping-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-localization-mapping-devel + target-image: docker-metadata-action-universe-localization-mapping-devel flavor: | latest=false @@ -128,11 +128,11 @@ runs: id: meta-universe-localization-mapping uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-localization-mapping-${{ inputs.platform }} type=raw,value=universe-localization-mapping-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-localization-mapping + target-image: docker-metadata-action-universe-localization-mapping flavor: | latest=false @@ -140,11 +140,11 @@ runs: id: meta-universe-planning-control-devel uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-planning-control-devel-${{ inputs.platform }} type=raw,value=universe-planning-control-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-planning-control-devel + target-image: docker-metadata-action-universe-planning-control-devel flavor: | latest=false @@ -152,11 +152,11 @@ runs: id: meta-universe-planning-control uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-planning-control-${{ inputs.platform }} type=raw,value=universe-planning-control-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-planning-control + target-image: docker-metadata-action-universe-planning-control flavor: | latest=false @@ -164,11 +164,11 @@ runs: id: meta-universe-vehicle-system-devel uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-vehicle-system-devel-${{ inputs.platform }} type=raw,value=universe-vehicle-system-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-vehicle-system-devel + target-image: docker-metadata-action-universe-vehicle-system-devel flavor: | latest=false @@ -176,11 +176,11 @@ runs: id: meta-universe-vehicle-system uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-vehicle-system-${{ inputs.platform }} type=raw,value=universe-vehicle-system-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-vehicle-system + target-image: docker-metadata-action-universe-vehicle-system flavor: | latest=false @@ -188,11 +188,11 @@ runs: id: meta-universe-devel uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-devel-${{ inputs.platform }} type=raw,value=universe-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe-devel + target-image: docker-metadata-action-universe-devel flavor: | latest=false @@ -200,11 +200,11 @@ runs: id: meta-universe uses: docker/metadata-action@v5 with: - images: ghcr.io/${{ github.repository_owner }}/${{ inputs.bake-target }} + images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }} tags: | type=raw,value=universe-${{ inputs.platform }} type=raw,value=universe-${{ steps.date.outputs.date }}-${{ inputs.platform }} - bake-target: docker-metadata-action-universe + target-image: docker-metadata-action-universe flavor: | latest=auto diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index bfb6383c208..3b30acb0440 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -1,16 +1,16 @@ name: docker-build -description: "" +description: Workflow do only build images. inputs: platform: - description: "" + description: Target platform. required: true cache-tag-suffix: - description: "" + description: Suffix of the target cache tag. required: true build-args: - description: "" - required: true + description: Additional build args. + required: false runs: using: composite diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml index 01d6be45f59..5fd899aaac1 100644 --- a/.github/workflows/docker-build-and-push-arm64.yaml +++ b/.github/workflows/docker-build-and-push-arm64.yaml @@ -51,7 +51,7 @@ jobs: uses: ./.github/actions/docker-build-and-push with: platform: arm64 - bake-target: autoware + target-image: autoware build-args: | *.platform=linux/arm64 *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} @@ -68,7 +68,7 @@ jobs: uses: ./.github/actions/docker-build-and-push-cuda with: platform: arm64 - bake-target: autoware + target-image: autoware build-args: | *.platform=linux/arm64 *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml index 232b78c6569..9815aa170f3 100644 --- a/.github/workflows/docker-build-and-push.yaml +++ b/.github/workflows/docker-build-and-push.yaml @@ -46,7 +46,7 @@ jobs: uses: ./.github/actions/docker-build-and-push with: platform: amd64 - bake-target: autoware + target-image: autoware build-args: | *.platform=linux/amd64 *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} @@ -63,7 +63,7 @@ jobs: uses: ./.github/actions/docker-build-and-push-cuda with: platform: amd64 - bake-target: autoware + target-image: autoware build-args: | *.platform=linux/amd64 *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }} From 9c1feb04214c5054036e904e0a16738536e8ed78 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 11 Nov 2024 21:22:37 +0900 Subject: [PATCH 2/3] fix feedback Signed-off-by: Yutaka Kondo --- .../docker-build-and-push-cuda/action.yaml | 10 +++---- .../actions/docker-build-and-push/action.yaml | 26 +++++++++---------- .github/actions/docker-build/action.yaml | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml index df1e7c00163..5bf46d0cc17 100644 --- a/.github/actions/docker-build-and-push-cuda/action.yaml +++ b/.github/actions/docker-build-and-push-cuda/action.yaml @@ -1,5 +1,5 @@ name: docker-build-and-push-cuda -description: Workflow do build and push CUDA images to registry. +description: Composite action to build and push CUDA images to registry. inputs: platform: @@ -59,7 +59,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-devel-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-sensing-perception-devel-cuda + bake-target: docker-metadata-action-universe-sensing-perception-devel-cuda flavor: | latest=false @@ -71,7 +71,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-cuda-${{ inputs.platform }} type=raw,value=universe-sensing-perception-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-sensing-perception-cuda + bake-target: docker-metadata-action-universe-sensing-perception-cuda flavor: | latest=false @@ -83,7 +83,7 @@ runs: tags: | type=raw,value=universe-devel-cuda-${{ inputs.platform }} type=raw,value=universe-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-devel-cuda + bake-target: docker-metadata-action-universe-devel-cuda flavor: | latest=false @@ -95,7 +95,7 @@ runs: tags: | type=raw,value=universe-cuda-${{ inputs.platform }} type=raw,value=universe-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-cuda + bake-target: docker-metadata-action-universe-cuda flavor: | latest=auto diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml index 58a70c0a36f..3e3bc857fea 100644 --- a/.github/actions/docker-build-and-push/action.yaml +++ b/.github/actions/docker-build-and-push/action.yaml @@ -1,5 +1,5 @@ name: docker-build-and-push -description: Workflow do build and push non CUDA images to registry. +description: Composite action to build and push non CUDA images to registry. inputs: platform: @@ -72,7 +72,7 @@ runs: tags: | type=raw,value=base-${{ inputs.platform }} type=raw,value=base-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-base + bake-target: docker-metadata-action-base flavor: | latest=false @@ -84,7 +84,7 @@ runs: tags: | type=raw,value=core-devel-${{ inputs.platform }} type=raw,value=core-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-core-devel + bake-target: docker-metadata-action-core-devel flavor: | latest=false @@ -96,7 +96,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-devel-${{ inputs.platform }} type=raw,value=universe-sensing-perception-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-sensing-perception-devel + bake-target: docker-metadata-action-universe-sensing-perception-devel flavor: | latest=false @@ -108,7 +108,7 @@ runs: tags: | type=raw,value=universe-sensing-perception-${{ inputs.platform }} type=raw,value=universe-sensing-perception-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-sensing-perception + bake-target: docker-metadata-action-universe-sensing-perception flavor: | latest=false @@ -120,7 +120,7 @@ runs: tags: | type=raw,value=universe-localization-mapping-devel-${{ inputs.platform }} type=raw,value=universe-localization-mapping-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-localization-mapping-devel + bake-target: docker-metadata-action-universe-localization-mapping-devel flavor: | latest=false @@ -132,7 +132,7 @@ runs: tags: | type=raw,value=universe-localization-mapping-${{ inputs.platform }} type=raw,value=universe-localization-mapping-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-localization-mapping + bake-target: docker-metadata-action-universe-localization-mapping flavor: | latest=false @@ -144,7 +144,7 @@ runs: tags: | type=raw,value=universe-planning-control-devel-${{ inputs.platform }} type=raw,value=universe-planning-control-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-planning-control-devel + bake-target: docker-metadata-action-universe-planning-control-devel flavor: | latest=false @@ -156,7 +156,7 @@ runs: tags: | type=raw,value=universe-planning-control-${{ inputs.platform }} type=raw,value=universe-planning-control-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-planning-control + bake-target: docker-metadata-action-universe-planning-control flavor: | latest=false @@ -168,7 +168,7 @@ runs: tags: | type=raw,value=universe-vehicle-system-devel-${{ inputs.platform }} type=raw,value=universe-vehicle-system-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-vehicle-system-devel + bake-target: docker-metadata-action-universe-vehicle-system-devel flavor: | latest=false @@ -180,7 +180,7 @@ runs: tags: | type=raw,value=universe-vehicle-system-${{ inputs.platform }} type=raw,value=universe-vehicle-system-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-vehicle-system + bake-target: docker-metadata-action-universe-vehicle-system flavor: | latest=false @@ -192,7 +192,7 @@ runs: tags: | type=raw,value=universe-devel-${{ inputs.platform }} type=raw,value=universe-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe-devel + bake-target: docker-metadata-action-universe-devel flavor: | latest=false @@ -204,7 +204,7 @@ runs: tags: | type=raw,value=universe-${{ inputs.platform }} type=raw,value=universe-${{ steps.date.outputs.date }}-${{ inputs.platform }} - target-image: docker-metadata-action-universe + bake-target: docker-metadata-action-universe flavor: | latest=auto diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index 3b30acb0440..64f3e78d8f8 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -1,5 +1,5 @@ name: docker-build -description: Workflow do only build images. +description: Compsite action to build images only. inputs: platform: From f0f54cb5d5e793d19150928fd996851e8aa56784 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 11 Nov 2024 21:32:58 +0900 Subject: [PATCH 3/3] Update .github/actions/docker-build/action.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: M. Fatih Cırıt --- .github/actions/docker-build/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml index 64f3e78d8f8..9a6a6e7e140 100644 --- a/.github/actions/docker-build/action.yaml +++ b/.github/actions/docker-build/action.yaml @@ -1,5 +1,5 @@ name: docker-build -description: Compsite action to build images only. +description: Composite action to build images only. inputs: platform: