Skip to content

Commit b0214f8

Browse files
committed
Fix docker builds
- DEB_DISTRO was not actually passed as a build argument - python3-rosinstall is not available in Noble anymore However, it's not needed as well, as we use vcstool now. - ros-desktop-full is not available for Noble due to missing gazebo
1 parent 695ce19 commit b0214f8

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.github/docker/moveit-ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN \
2222
# Qt6 packages for Jammy
2323
$(test "$ROS_DISTRO" = "one" && echo "qt6-base-dev qt6-base-dev-tools libqt6opengl6-dev") \
2424
# Preferred build tools
25-
clang clang-format-12 clang-tidy clang-tools ccache && \
25+
clang clang-format clang-tidy clang-tools ccache && \
2626
#
2727
# Download MoveIt sources, so that we can fetch all necessary dependencies
2828
mkdir -p /tmp/src && \

.github/docker/ros-base/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LABEL org.opencontainers.image.authors="Robert Haschke <rhaschke@techfak.uni-bie
66
RUN apt-get update && apt-get install --no-install-recommends -y \
77
build-essential \
88
python3-rosdep \
9-
python3-rosinstall \
109
python3-vcstool \
1110
&& rm -rf /var/lib/apt/lists/*
1211

.github/workflows/docker.build.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ jobs:
6565
uses: docker/build-push-action@v5
6666
with:
6767
context: .github/docker/${{ inputs.CONTEXT }}
68-
build-args: ROS_DISTRO=${{ inputs.ROS_DISTRO }} DEB_DISTRO=${{ inputs.DEB_DISTRO }}
68+
build-args: |
69+
ROS_DISTRO=${{ inputs.ROS_DISTRO }}
70+
DEB_DISTRO=${{ inputs.DEB_DISTRO }}
6971
push: true
7072
no-cache: ${{ steps.apt.outputs.no_cache || github.event_name == 'workflow_dispatch' }}
7173
cache-from: type=registry,ref=${{ env.IMAGE }}

.github/workflows/docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
strategy:
7878
fail-fast: false
7979
matrix:
80-
DEB_DISTRO: [jammy, noble]
80+
DEB_DISTRO: [jammy]
8181

8282
uses: ./.github/workflows/docker.build.yaml
8383
secrets: inherit

0 commit comments

Comments
 (0)