Skip to content

Commit 71365d9

Browse files
committed
adapt to bookworm
1 parent d3495a5 commit 71365d9

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ jobs:
14701470
runs-on: ubuntu-24.04
14711471
env:
14721472
ROS_DISTRO: one
1473-
DEB_DISTRO: sid
1473+
DEB_DISTRO: bookworm
14741474
steps:
14751475
- name: get apt packages from last job
14761476
uses: actions/cache/restore@v4

.github/workflows/worker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-24.04
1313
env:
1414
ROS_DISTRO: one
15-
DEB_DISTRO: sid
15+
DEB_DISTRO: bookworm
1616
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 10
1717
JOBS_YAML: /home/runner/jobs.yaml
1818
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
- See the [main branch](https://github.com/v4hn/ros-o-builder/tree/main) for more information.
44

5-
- See the [package branch](https://github.com/v4hn/ros-o-builder/tree/sid-one-unstable) for install information and build details.
5+
- See the [package branch](https://github.com/v4hn/ros-o-builder/tree/bookworm-one-unstable) for install information and build details.

docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# debian sid docker with (some) preinstalled ros-one packages
2-
FROM debian:sid
1+
# debian bookworm docker with (some) preinstalled ros-one packages
2+
FROM debian:bookworm
33

44
RUN apt update
55
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
66
RUN apt install -y vim less ca-certificates sudo bash-completion python3-pip git tmux python-is-python3
77
RUN pip3 install catkin-tools
88

9-
RUN echo "deb [trusted=yes] https://raw.githubusercontent.com/v4hn/ros-o-builder/sid-one-unstable/repository ./" | sudo tee /etc/apt/sources.list.d/v4hn_ros-o-builder.list
9+
RUN echo "deb [trusted=yes] https://raw.githubusercontent.com/v4hn/ros-o-builder/bookworm-one-unstable/repository ./" | sudo tee /etc/apt/sources.list.d/v4hn_ros-o-builder.list
1010
RUN sudo apt update
1111
RUN sudo apt install -y python3-rosdep2
12-
RUN echo "yaml https://raw.githubusercontent.com/v4hn/ros-o-builder/sid-one-unstable/repository/local.yaml debian" | sudo tee /etc/ros/rosdep/sources.list.d/1-v4hn_ros-o-builder.list
12+
RUN echo "yaml https://raw.githubusercontent.com/v4hn/ros-o-builder/bookworm-one-unstable/repository/local.yaml debian" | sudo tee /etc/ros/rosdep/sources.list.d/1-v4hn_ros-o-builder.list
1313
RUN rosdep update
1414

1515
RUN apt install -y ros-one-desktop-full

docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/bash
22

3-
docker build -t sid-ros-one --no-cache "$@" .
3+
docker build -t bookworm-ros-one --no-cache "$@" .

docker/run_latest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
55
PDIR="$(dirname "$DIR")"
66

7-
exec docker run -it --mount type=bind,source=$PDIR,destination=/ros-o-builder sid-ros-one:latest bash -l
7+
exec docker run -it --mount type=bind,source=$PDIR,destination=/ros-o-builder bookworm-ros-one:latest bash -l

scripts/build-yaml-generator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
runs-on: ubuntu-24.04
108108
env:
109109
ROS_DISTRO: one
110-
DEB_DISTRO: sid
110+
DEB_DISTRO: bookworm
111111
steps:
112112
- name: get apt packages from last job
113113
uses: actions/cache/restore@@v4

0 commit comments

Comments
 (0)