@@ -126,10 +126,10 @@ jobs:
126126 fail-fast : false
127127 matrix :
128128 include :
129- - { image: sih, target: sih, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.sih }
130- - { image: sih, target: sih, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.sih }
131- - { image: gazebo, target: default, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.gazebo }
132- - { image: gazebo, target: default, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.gazebo }
129+ - { image: sih, image_name: px4-sitl, target: sih, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.sih }
130+ - { image: sih, image_name: px4-sitl, target: sih, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.sih }
131+ - { image: gazebo, image_name: px4-sitl-gazebo, target: default, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.gazebo }
132+ - { image: gazebo, image_name: px4-sitl-gazebo, target: default, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.gazebo }
133133 steps :
134134 - uses : runs-on/action@v2
135135 - uses : actions/checkout@v6
@@ -164,10 +164,10 @@ jobs:
164164 context : docker-context
165165 file : Tools/packaging/${{ matrix.dockerfile }}
166166 tags : |
167- px4io/px4-sitl- ${{ matrix.image }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
168- px4io/px4-sitl- ${{ matrix.image }}:latest-${{ matrix.arch }}
169- ghcr.io/px4/px4-sitl- ${{ matrix.image }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
170- ghcr.io/px4/px4-sitl- ${{ matrix.image }}:latest-${{ matrix.arch }}
167+ px4io/${{ matrix.image_name }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
168+ px4io/${{ matrix.image_name }}:latest-${{ matrix.arch }}
169+ ghcr.io/px4/${{ matrix.image_name }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
170+ ghcr.io/px4/${{ matrix.image_name }}:latest-${{ matrix.arch }}
171171 platforms : ${{ matrix.platform }}
172172 load : false
173173 push : ${{ needs.setup.outputs.should_push == 'true' }}
@@ -185,7 +185,9 @@ jobs:
185185 runs-on : [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
186186 strategy :
187187 matrix :
188- image : [sih, gazebo]
188+ include :
189+ - { image: sih, image_name: px4-sitl }
190+ - { image: gazebo, image_name: px4-sitl-gazebo }
189191 steps :
190192 - uses : runs-on/action@v2
191193
@@ -199,7 +201,7 @@ jobs:
199201 VERSION="${{ needs.setup.outputs.px4_version }}"
200202
201203 for REGISTRY in px4io ghcr.io/px4; do
202- IMAGE="${REGISTRY}/px4-sitl- ${{ matrix.image }}"
204+ IMAGE="${REGISTRY}/${{ matrix.image_name }}"
203205
204206 for TAG in ${VERSION} latest; do
205207 docker manifest create ${IMAGE}:${TAG} \
0 commit comments