Skip to content

Commit 4b4e695

Browse files
committed
Backport #220 into Jazzy
1 parent fe3861d commit 4b4e695

File tree

10 files changed

+16
-14
lines changed

10 files changed

+16
-14
lines changed

.devcontainer/nouveau/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
1+
FROM ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop
22

33
# Install ROS dependencies
44
# This is done in a previous stage, but we include it again here in case anyone wants to

.devcontainer/nvidia/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
1+
FROM ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop-nvidia
22

33
# Install ROS dependencies
44
# This is done in a previous stage, but we include it again here in case anyone wants to

.devcontainer/robot/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Dockerfile for *-robot development container
33
#
44
ARG BLUE_GITHUB_REPO=Robotic-Decision-Making-Lab/blue
5-
ARG ROS_DISTRO=rolling
5+
ARG ROS_DISTRO=jazzy
66
FROM ${BLUE_GITHUB_REPO}:${ROS_DISTRO}-robot
77

88
# Install ROS dependencies

.devcontainer/robot/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"context": "../..",
66
"args": {
77
"BLUE_GITHUB_REPO": "ghcr.io/robotic-decision-making-lab/blue",
8-
"ROS_DISTRO": "rolling"
8+
"ROS_DISTRO": "jazzy"
99
}
1010
},
1111
"workspaceMount": "source=${localWorkspaceFolder},target=/home/ubuntu/ws_blue/src/blue,type=bind",

.docker/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG ROS_DISTRO=rolling
1+
ARG ROS_DISTRO=jazzy
22
FROM ros:$ROS_DISTRO-ros-base AS ci
33

44
ENV DEBIAN_FRONTEND=noninteractive
@@ -111,6 +111,7 @@ RUN sudo apt-get -q update \
111111
# Manually install MAVROS from source in the ws_blue/ workspace
112112
WORKDIR $USER_WORKSPACE/src/
113113
ARG MAVROS_RELEASE=ros2
114+
# mavlink-gdp-release has not been released for Jazzy, so we use the Rolling release
114115
ARG MAVLINK_RELEASE=release/rolling/mavlink
115116
RUN git clone --depth 1 -b ${MAVROS_RELEASE} https://github.com/mavlink/mavros.git
116117
RUN git clone --depth 1 --recursive -b ${MAVLINK_RELEASE} https://github.com/mavlink/mavlink-gbp-release.git mavlink

.docker/compose/nouveau-desktop.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: "3"
22
services:
33
blue:
4-
image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
4+
image: ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop
55
environment:
66
- DISPLAY=${DISPLAY}
77
- XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}

.docker/compose/nvidia-desktop.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: "3"
22
services:
33
blue:
4-
image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
4+
# image: ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop-nvidia
5+
image: blue-test
56
environment:
67
- DISPLAY=${DISPLAY}
78
- XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}

.docker/compose/robot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
blue:
3-
image: ghcr.io/robotic-decision-making-lab/blue:rolling-robot
3+
image: ghcr.io/robotic-decision-making-lab/blue:jazzy-robot
44
build:
55
dockerfile: .docker/Dockerfile
66
target: robot

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
env:
22-
- IMAGE: rolling-ci
23-
ROS_DISTRO: rolling
22+
- IMAGE: jazzy-ci
23+
ROS_DISTRO: jazzy
2424
steps:
2525
- name: Checkout repository
2626
uses: actions/checkout@v4

.github/workflows/docker.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
ROS_DISTRO: [rolling]
25+
ROS_DISTRO: [jazzy]
2626
runs-on: ubuntu-latest
2727
permissions:
2828
packages: write
@@ -63,7 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
ROS_DISTRO: [rolling]
66+
ROS_DISTRO: [jazzy]
6767
runs-on: ubuntu-latest
6868
permissions:
6969
packages: write
@@ -112,7 +112,7 @@ jobs:
112112
strategy:
113113
fail-fast: false
114114
matrix:
115-
ROS_DISTRO: [rolling]
115+
ROS_DISTRO: [jazzy]
116116
runs-on: ubuntu-latest
117117
permissions:
118118
packages: write
@@ -153,7 +153,7 @@ jobs:
153153
strategy:
154154
fail-fast: false
155155
matrix:
156-
ROS_DISTRO: [rolling]
156+
ROS_DISTRO: [jazzy]
157157
runs-on: ubuntu-latest
158158
permissions:
159159
packages: write

0 commit comments

Comments
 (0)