From 8e86adf3db6ed1d9f44ad4b47fbbf47a664e4870 Mon Sep 17 00:00:00 2001
From: snaens <samuelpelz007@gmail.com>
Date: Wed, 31 Jan 2024 17:59:27 +0100
Subject: [PATCH] fix build, rename container image

- fixed: build failed due to problem with libc
- renamed container from bento-box image to rosbox:robot

**this should be the first version to universally work on both robots**
---
 bento-box/podman-compose.yaml | 2 +-
 build-container/Dockerfile    | 2 +-
 build-container/makefile      | 5 ++++-
 zyklop/podman-compose.yaml    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bento-box/podman-compose.yaml b/bento-box/podman-compose.yaml
index 2cd398b..8d5c7d6 100644
--- a/bento-box/podman-compose.yaml
+++ b/bento-box/podman-compose.yaml
@@ -2,7 +2,7 @@ version: "3.0"
 
 services:
   bento-box:
-    image: bentorobotics/bento-box:1.1
+    image: bentorobotics/rosbox:robot
     container_name: bento-box-ros
     user: root
     restart: always
diff --git a/build-container/Dockerfile b/build-container/Dockerfile
index c3efd5d..49e318d 100644
--- a/build-container/Dockerfile
+++ b/build-container/Dockerfile
@@ -2,7 +2,7 @@ FROM ros:humble
 
 # Install dependencies & utilities
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install \
+RUN apt-get update && apt-get upgrade -y && apt-get install \
 		 btop \
 		 ros-humble-diagnostic-updater \
 		 ros-humble-diagnostic-aggregator \
diff --git a/build-container/makefile b/build-container/makefile
index 09d1f11..fa3f45d 100644
--- a/build-container/makefile
+++ b/build-container/makefile
@@ -1,4 +1,4 @@
-image_name = bento-box:1.1
+image_name = rosbox:robot
 
 build-container:
 	podman build -t $(image_name) .
@@ -7,3 +7,6 @@ multiarch-build-and-push:
 	podman manifest create bentorobotics/$(image_name)
 	podman build --platform linux/arm64,linux/amd64 --manifest bentorobotics/$(image_name) .
 	podman manifest push bentorobotics/$(image_name)
+
+clean:
+	podman image rm localhost/bentorobotics/$(image_name)
diff --git a/zyklop/podman-compose.yaml b/zyklop/podman-compose.yaml
index 3384071..4459433 100644
--- a/zyklop/podman-compose.yaml
+++ b/zyklop/podman-compose.yaml
@@ -2,7 +2,7 @@ version: "3.0"
 
 services:
   bento-box:
-    image: bentorobotics/bento-box:1.1
+    image: bentorobotics/rosbox:robot
     container_name: zyklop-ros
     user: root
     restart: always