fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci(deb): publish SIH image as px4io/px4-sitl

Browse Source 
The SIH image is the canonical PX4 SITL container, so drop the redundant
-sih suffix and publish it as px4io/px4-sitl. Gazebo continues to publish
as px4io/px4-sitl-gazebo.

Decouples the published image name from the matrix.image identifier by
introducing a matrix.repo field, so renames like this don't require
touching the matrix logic.

This is a breaking change for anyone pulling px4io/px4-sitl-sih directly;
the old tags remain available but no new ones will be published under
that name.

Signed-off-by: Ramon Roche <mrpollo@gmail.com>
This commit is contained in:
Ramon Roche 2026-04-07 18:00:59 -07:00
parent 1ba562f400
commit f77a1a44a0
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.github/workflows/build_deb_package.yml vendored
View File

@ -137,10 +137,10 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- { image: sih, target: sih, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.sih } - { image: sih, repo: px4-sitl, target: sih, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.sih }
- { image: sih, target: sih, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.sih } - { image: sih, repo: px4-sitl, target: sih, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.sih }
- { image: gazebo, target: default, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.gazebo } - { image: gazebo, repo: px4-sitl-gazebo, target: default, arch: amd64, runner: x64, platform: "linux/amd64", dockerfile: Dockerfile.gazebo }
- { image: gazebo, target: default, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.gazebo } - { image: gazebo, repo: px4-sitl-gazebo, target: default, arch: arm64, runner: arm64, platform: "linux/arm64", dockerfile: Dockerfile.gazebo }
steps: steps:
- uses: runs-on/action@v2 - uses: runs-on/action@v2
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -175,10 +175,10 @@ jobs:
context: docker-context context: docker-context
file: Tools/packaging/${{ matrix.dockerfile }} file: Tools/packaging/${{ matrix.dockerfile }}
tags: | tags: |
px4io/px4-sitl-${{ matrix.image }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }} px4io/${{ matrix.repo }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
px4io/px4-sitl-${{ matrix.image }}:latest-${{ matrix.arch }} px4io/${{ matrix.repo }}:latest-${{ matrix.arch }}
ghcr.io/px4/px4-sitl-${{ matrix.image }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }} ghcr.io/px4/${{ matrix.repo }}:${{ needs.setup.outputs.px4_version }}-${{ matrix.arch }}
ghcr.io/px4/px4-sitl-${{ matrix.image }}:latest-${{ matrix.arch }} ghcr.io/px4/${{ matrix.repo }}:latest-${{ matrix.arch }}
platforms: ${{ matrix.platform }} platforms: ${{ matrix.platform }}
load: false load: false
push: ${{ needs.setup.outputs.should_push == 'true' }} push: ${{ needs.setup.outputs.should_push == 'true' }}
@ -196,7 +196,9 @@ jobs:
runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false] runs-on: [runs-on,"runner=1cpu-linux-x64","image=ubuntu24-full-x64","run-id=${{ github.run_id }}",extras=s3-cache,spot=false]
strategy: strategy:
matrix: matrix:
image: [sih, gazebo] include:
- { image: sih, repo: px4-sitl }
- { image: gazebo, repo: px4-sitl-gazebo }
steps: steps:
- uses: runs-on/action@v2 - uses: runs-on/action@v2
@ -210,7 +212,7 @@ jobs:
VERSION="${{ needs.setup.outputs.px4_version }}" VERSION="${{ needs.setup.outputs.px4_version }}"
for REGISTRY in px4io ghcr.io/px4; do for REGISTRY in px4io ghcr.io/px4; do
IMAGE="${REGISTRY}/px4-sitl-${{ matrix.image }}" IMAGE="${REGISTRY}/${{ matrix.repo }}"
for TAG in ${VERSION} latest; do for TAG in ${VERSION} latest; do
docker manifest create ${IMAGE}:${TAG} \ docker manifest create ${IMAGE}:${TAG} \

6
Tools/packaging/Dockerfile.sih
View File

@ -4,13 +4,13 @@
# #
# Build: # Build:
# make px4_sitl_sih && cd build/px4_sitl_sih && cpack -G DEB && cd ../.. # make px4_sitl_sih && cd build/px4_sitl_sih && cpack -G DEB && cd ../..
# docker build -f Tools/packaging/Dockerfile.sih -t px4io/px4-sitl-sih:v1.17.0 build/px4_sitl_sih/ # docker build -f Tools/packaging/Dockerfile.sih -t px4io/px4-sitl:v1.17.0 build/px4_sitl_sih/
# #
# Run (Linux): # Run (Linux):
# docker run --rm -it --network host px4io/px4-sitl-sih:v1.17.0 # docker run --rm -it --network host px4io/px4-sitl:v1.17.0
# #
# Run (macOS / Windows): # Run (macOS / Windows):
# docker run --rm -it -p 14550:14550/udp -p 14540:14540/udp -p 19410:19410/udp -p 8888:8888/udp px4io/px4-sitl-sih:v1.17.0 # docker run --rm -it -p 14550:14550/udp -p 14540:14540/udp -p 19410:19410/udp -p 8888:8888/udp px4io/px4-sitl:v1.17.0
FROM ubuntu:24.04 AS build FROM ubuntu:24.04 AS build
COPY px4_*.deb /tmp/ COPY px4_*.deb /tmp/

2
Tools/packaging/test_sih_mission.py
View File

@ -7,7 +7,7 @@ Validates that the SIH Docker container works end-to-end with MAVSDK.
Prerequisites: Prerequisites:
- Docker container running: - Docker container running:
docker run --rm --network host px4io/px4-sitl-sih:v1.17.0-alpha1 docker run --rm --network host px4io/px4-sitl:v1.17.0-alpha1
- pip install mavsdk - pip install mavsdk
- mavsim-viewer running (optional): - mavsim-viewer running (optional):
/path/to/mavsim-viewer -n 1 /path/to/mavsim-viewer -n 1