From 5d10493b15ab26bd0ef2f4c9d0746609195405a8 Mon Sep 17 00:00:00 2001
From: Jakub Delicat <jakub.delicat@husarion.com>
Date: Tue, 23 Jul 2024 10:53:14 +0200
Subject: [PATCH] changed to husarnet base image

Signed-off-by: Jakub Delicat <jakub.delicat@husarion.com>
---
 Dockerfile.gazebo   | 10 +++-------
 Dockerfile.hardware | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.gazebo b/Dockerfile.gazebo
index 2b75955..72e1efc 100644
--- a/Dockerfile.gazebo
+++ b/Dockerfile.gazebo
@@ -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"]
 
@@ -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"]
@@ -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"]
diff --git a/Dockerfile.hardware b/Dockerfile.hardware
index bd85ba4..f31b915 100644
--- a/Dockerfile.hardware
+++ b/Dockerfile.hardware
@@ -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"]
@@ -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"]
@@ -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"]