Skip to content

Commit

Permalink
changed to husarnet base image
Browse files Browse the repository at this point in the history
Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>
  • Loading branch information
delihus committed Jul 23, 2024
1 parent 74380a9 commit 5d10493
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
10 changes: 3 additions & 7 deletions Dockerfile.gazebo
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
ARG ROS_DISTRO=humble
ARG PREFIX=
ARG MYDISTRO=ros

## =========================== Healthcheck builder ===============================

FROM ros:${PREFIX}${ROS_DISTRO}-ros-base AS healthcheck_builder
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-base AS healthcheck_builder

ARG ROS_DISTRO
ARG PREFIX
ARG MYDISTRO

SHELL ["/bin/bash", "-c"]

Expand All @@ -34,10 +32,9 @@ RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
rm -rf build log src

## =========================== ROS builder ===============================
FROM ros:${PREFIX}${ROS_DISTRO}-ros-base AS ros_builder
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-base AS ros_builder

ARG PREFIX
ARG MYDISTRO

# select bash as default shell
SHELL ["/bin/bash", "-c"]
Expand Down Expand Up @@ -72,11 +69,10 @@ RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
rm -rf build log

## =========================== Final Stage ===============================
FROM ros:${PREFIX}${ROS_DISTRO}-ros-core
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-core

ARG ROS_DISTRO
ARG PREFIX
ARG MYDISTRO

# select bash as default shell
SHELL ["/bin/bash", "-c"]
Expand Down
10 changes: 3 additions & 7 deletions Dockerfile.hardware
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
ARG ROS_DISTRO=humble
ARG MYDISTRO=ros
ARG PREFIX=

## =========================== Healthcheck builder ===============================

FROM ros:${PREFIX}${ROS_DISTRO}-ros-base AS healthcheck_builder
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-base AS healthcheck_builder

ARG ROS_DISTRO
ARG PREFIX
ARG MYDISTRO
ENV HUSARION_ROS_BUILD hardware

SHELL ["/bin/bash", "-c"]
Expand All @@ -35,11 +33,10 @@ RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
rm -rf build log src

## =========================== ROS builder ===============================
FROM ros:${PREFIX}${ROS_DISTRO}-ros-base AS ros_builder
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-base AS ros_builder

ARG ROS_DISTRO
ARG PREFIX
ARG MYDISTRO
ENV HUSARION_ROS_BUILD hardware

SHELL ["/bin/bash", "-c"]
Expand Down Expand Up @@ -68,11 +65,10 @@ RUN git clone --depth 1 -b jazzy-devel https://github.com/husarion/rosbot_ros.gi
rm -rf build log

## =========================== Final Stage ===============================
FROM ros:${PREFIX}${ROS_DISTRO}-ros-core
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-core

ARG ROS_DISTRO
ARG PREFIX
ARG MYDISTRO
ENV HUSARION_ROS_BUILD hardware

SHELL ["/bin/bash", "-c"]
Expand Down

0 comments on commit 5d10493

Please sign in to comment.