Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ros2 use branch name #86

Merged
merged 4 commits into from
Sep 12, 2024
Merged

Ros2 use branch name #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
758c825
Bump docker image build action and add handling branch name arg
pawelirh Sep 11, 2024
c0614f0
Add type and default value
pawelirh Sep 11, 2024
5030f07
Parametrize branch name in Dockerfiles
pawelirh Sep 11, 2024
98cffa2
Change dockerfile args scope
pawelirh Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/ros-docker-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ name: Build/Publish ROS Docker Image
on:
workflow_dispatch:
inputs:
panther_codebase_version:
description: Version of the panther_ros to be used in the docker image (branch/tag/commit).
required: true
type: string
default: ros2-devel
build_type:
description: Is it a "development" or a "stable" release?
required: true
Expand Down Expand Up @@ -48,13 +53,14 @@ jobs:
uses: actions/checkout@v2

- name: Build Docker Image
uses: husarion-ci/ros-docker-img-action@v0.5
uses: husarion-ci/ros-docker-img-action@v0.6
with:
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
main_branch_name: ros2
dockerfile: ${{ matrix.dockerfile }}
repo_name: ${{ matrix.repo_name }}
branch_name: ${{ inputs.panther_codebase_version }}
build_type: ${{ inputs.build_type }}
ros_distro: ${{ matrix.ros_distro }}
platforms: ${{ matrix.platforms }}
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.hardware
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
ARG ROS_DISTRO=humble
ARG BUILD_TEST=OFF

FROM husarnet/ros:${ROS_DISTRO}-ros-core

ARG BRANCH_NAME=ros2-devel
ARG BUILD_TEST=OFF

ENV HUSARION_ROS_BUILD_TYPE=hardware

STOPSIGNAL SIGINT
Expand All @@ -13,7 +15,7 @@ RUN apt-get update && \
apt-get install -y \
ros-dev-tools && \
# Setup workspace
git clone -b ros2-devel https://github.com/husarion/panther_ros.git src/panther_ros && \
git clone -b ${BRANCH_NAME} https://github.com/husarion/panther_ros.git src/panther_ros && \
vcs import src < src/panther_ros/panther/panther_${HUSARION_ROS_BUILD_TYPE}.repos && \
cp -r src/ros2_controllers/diff_drive_controller src && \
cp -r src/ros2_controllers/imu_sensor_broadcaster src && \
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.simulation
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
ARG ROS_DISTRO=humble
ARG BUILD_TEST=OFF

FROM husarnet/ros:${ROS_DISTRO}-ros-core

ARG BRANCH_NAME=ros2-devel
ARG BUILD_TEST=OFF

ENV HUSARION_ROS_BUILD_TYPE=simulation

STOPSIGNAL SIGINT
Expand All @@ -13,7 +15,7 @@ RUN apt-get update && \
apt-get install -y \
ros-dev-tools && \
# Setup workspace
git clone -b ros2-devel https://github.com/husarion/panther_ros.git src/panther_ros && \
git clone -b ${BRANCH_NAME} https://github.com/husarion/panther_ros.git src/panther_ros && \
vcs import src < src/panther_ros/panther/panther_${HUSARION_ROS_BUILD_TYPE}.repos && \
cp -r src/ros2_controllers/diff_drive_controller src && \
cp -r src/ros2_controllers/imu_sensor_broadcaster src && \
Expand Down
Loading