Skip to content

Commit

Permalink
Backport #220 into Jazzy
Browse files Browse the repository at this point in the history
  • Loading branch information
evan-palmer committed Aug 17, 2024
1 parent fe3861d commit 4b4e695
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/nouveau/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
FROM ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop

# Install ROS dependencies
# This is done in a previous stage, but we include it again here in case anyone wants to
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/nvidia/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
FROM ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop-nvidia

# Install ROS dependencies
# This is done in a previous stage, but we include it again here in case anyone wants to
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/robot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Dockerfile for *-robot development container
#
ARG BLUE_GITHUB_REPO=Robotic-Decision-Making-Lab/blue
ARG ROS_DISTRO=rolling
ARG ROS_DISTRO=jazzy
FROM ${BLUE_GITHUB_REPO}:${ROS_DISTRO}-robot

# Install ROS dependencies
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/robot/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"context": "../..",
"args": {
"BLUE_GITHUB_REPO": "ghcr.io/robotic-decision-making-lab/blue",
"ROS_DISTRO": "rolling"
"ROS_DISTRO": "jazzy"
}
},
"workspaceMount": "source=${localWorkspaceFolder},target=/home/ubuntu/ws_blue/src/blue,type=bind",
Expand Down
3 changes: 2 additions & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ROS_DISTRO=rolling
ARG ROS_DISTRO=jazzy
FROM ros:$ROS_DISTRO-ros-base AS ci

ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -111,6 +111,7 @@ RUN sudo apt-get -q update \
# Manually install MAVROS from source in the ws_blue/ workspace
WORKDIR $USER_WORKSPACE/src/
ARG MAVROS_RELEASE=ros2
# mavlink-gdp-release has not been released for Jazzy, so we use the Rolling release
ARG MAVLINK_RELEASE=release/rolling/mavlink
RUN git clone --depth 1 -b ${MAVROS_RELEASE} https://github.com/mavlink/mavros.git
RUN git clone --depth 1 --recursive -b ${MAVLINK_RELEASE} https://github.com/mavlink/mavlink-gbp-release.git mavlink
Expand Down
2 changes: 1 addition & 1 deletion .docker/compose/nouveau-desktop.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
blue:
image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop
image: ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop
environment:
- DISPLAY=${DISPLAY}
- XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}
Expand Down
3 changes: 2 additions & 1 deletion .docker/compose/nvidia-desktop.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
version: "3"
services:
blue:
image: ghcr.io/robotic-decision-making-lab/blue:rolling-desktop-nvidia
# image: ghcr.io/robotic-decision-making-lab/blue:jazzy-desktop-nvidia
image: blue-test
environment:
- DISPLAY=${DISPLAY}
- XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR}
Expand Down
2 changes: 1 addition & 1 deletion .docker/compose/robot.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
blue:
image: ghcr.io/robotic-decision-making-lab/blue:rolling-robot
image: ghcr.io/robotic-decision-making-lab/blue:jazzy-robot
build:
dockerfile: .docker/Dockerfile
target: robot
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
fail-fast: false
matrix:
env:
- IMAGE: rolling-ci
ROS_DISTRO: rolling
- IMAGE: jazzy-ci
ROS_DISTRO: jazzy
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling]
ROS_DISTRO: [jazzy]
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down

0 comments on commit 4b4e695

Please sign in to comment.