Skip to content

Commit

Permalink
fix build, rename container image
Browse files Browse the repository at this point in the history
- 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**
  • Loading branch information
snaens committed Jan 31, 2024
1 parent 7a9e64b commit 8e86adf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bento-box/podman-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-container/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 4 additions & 1 deletion build-container/makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image_name = bento-box:1.1
image_name = rosbox:robot

build-container:
podman build -t $(image_name) .
Expand All @@ -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)
2 changes: 1 addition & 1 deletion zyklop/podman-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8e86adf

Please sign in to comment.