Skip to content

Add desktop image #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
athackst merged 1 commit into from
Mar 19, 2026
Merged

Add desktop image #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
{
"name": "Docker in Docker",
"image": "mcr.microsoft.com/devcontainers/base:bullseye",
"image": "mcr.microsoft.com/devcontainers/base:jammy",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {
"installZsh": "true",
"upgradePackages": "false",
"uid": "1000",
"gid": "1000",
"installOhMyZsh": "true",
"nonFreePackages": "true"
},
"ghcr.io/devcontainers/features/docker-from-docker:1": {
"version": "latest",
"enableNonRootDocker": "true",
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
__pycache__
site/
site/
.venv/
97 changes: 80 additions & 17 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ target "ros2-rolling-dev" {
]
}

target "ros2-rolling-desktop" {
context = "ros2"
dockerfile = "rolling.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:rolling-desktop",
]
}

target "ros2-rolling-full" {
context = "ros2"
dockerfile = "rolling.Dockerfile"
Expand All @@ -43,7 +52,7 @@ target "ros2-rolling-gazebo" {

# ---- group for all ros2-rolling ----
group "ros2-rolling" {
targets = ["ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-full", "ros2-rolling-gazebo"]
targets = ["ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-desktop", "ros2-rolling-full", "ros2-rolling-gazebo"]
}

# ----------- targets for ros2-rolling-cuda -----------
Expand All @@ -66,6 +75,15 @@ target "ros2-rolling-cuda-dev" {
]
}

target "ros2-rolling-cuda-desktop" {
context = "ros2"
dockerfile = "rolling-cuda.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:rolling-cuda-desktop",
]
}

target "ros2-rolling-cuda-full" {
context = "ros2"
dockerfile = "rolling-cuda.Dockerfile"
Expand All @@ -86,7 +104,7 @@ target "ros2-rolling-cuda-gazebo" {

# ---- group for all ros2-rolling-cuda ----
group "ros2-rolling-cuda" {
targets = ["ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo"]
targets = ["ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-desktop", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo"]
}

# ----------- targets for ros2-kilted -----------
Expand All @@ -109,6 +127,15 @@ target "ros2-kilted-dev" {
]
}

target "ros2-kilted-desktop" {
context = "ros2"
dockerfile = "kilted.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:kilted-desktop",
]
}

target "ros2-kilted-full" {
context = "ros2"
dockerfile = "kilted.Dockerfile"
Expand All @@ -129,7 +156,7 @@ target "ros2-kilted-gazebo" {

# ---- group for all ros2-kilted ----
group "ros2-kilted" {
targets = ["ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-full", "ros2-kilted-gazebo"]
targets = ["ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-desktop", "ros2-kilted-full", "ros2-kilted-gazebo"]
}

# ----------- targets for ros2-jazzy -----------
Expand All @@ -152,6 +179,15 @@ target "ros2-jazzy-dev" {
]
}

target "ros2-jazzy-desktop" {
context = "ros2"
dockerfile = "jazzy.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:jazzy-desktop",
]
}

target "ros2-jazzy-full" {
context = "ros2"
dockerfile = "jazzy.Dockerfile"
Expand All @@ -172,7 +208,7 @@ target "ros2-jazzy-gazebo" {

# ---- group for all ros2-jazzy ----
group "ros2-jazzy" {
targets = ["ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-full", "ros2-jazzy-gazebo"]
targets = ["ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-desktop", "ros2-jazzy-full", "ros2-jazzy-gazebo"]
}

# ----------- targets for ros2-jazzy-cuda -----------
Expand All @@ -195,6 +231,15 @@ target "ros2-jazzy-cuda-dev" {
]
}

target "ros2-jazzy-cuda-desktop" {
context = "ros2"
dockerfile = "jazzy-cuda.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:jazzy-cuda-desktop",
]
}

target "ros2-jazzy-cuda-full" {
context = "ros2"
dockerfile = "jazzy-cuda.Dockerfile"
Expand All @@ -215,7 +260,7 @@ target "ros2-jazzy-cuda-gazebo" {

# ---- group for all ros2-jazzy-cuda ----
group "ros2-jazzy-cuda" {
targets = ["ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo"]
targets = ["ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-desktop", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo"]
}

# ----------- targets for ros2-humble -----------
Expand All @@ -238,6 +283,15 @@ target "ros2-humble-dev" {
]
}

target "ros2-humble-desktop" {
context = "ros2"
dockerfile = "humble.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:humble-desktop",
]
}

target "ros2-humble-full" {
context = "ros2"
dockerfile = "humble.Dockerfile"
Expand All @@ -258,7 +312,7 @@ target "ros2-humble-gazebo" {

# ---- group for all ros2-humble ----
group "ros2-humble" {
targets = ["ros2-humble-base", "ros2-humble-dev", "ros2-humble-full", "ros2-humble-gazebo"]
targets = ["ros2-humble-base", "ros2-humble-dev", "ros2-humble-desktop", "ros2-humble-full", "ros2-humble-gazebo"]
}

# ----------- targets for ros2-humble-cuda -----------
Expand All @@ -281,6 +335,15 @@ target "ros2-humble-cuda-dev" {
]
}

target "ros2-humble-cuda-desktop" {
context = "ros2"
dockerfile = "humble-cuda.Dockerfile"
target = "desktop"
tags = [
"${REGISTRY}/ros2:humble-cuda-desktop",
]
}

target "ros2-humble-cuda-full" {
context = "ros2"
dockerfile = "humble-cuda.Dockerfile"
Expand All @@ -301,7 +364,7 @@ target "ros2-humble-cuda-gazebo" {

# ---- group for all ros2-humble-cuda ----
group "ros2-humble-cuda" {
targets = ["ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo"]
targets = ["ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-desktop", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo"]
}

# ----------- targets for ignition-fortress -----------
Expand Down Expand Up @@ -482,29 +545,29 @@ group "gz-harmonic-cuda" {

# ---------- Parent-platform groups per entry (os/arch; variant-agnostic) ---------- #

group "ros2-rolling-linux-amd64" { targets = [ "ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-full", "ros2-rolling-gazebo" ] }
group "ros2-rolling-linux-amd64" { targets = [ "ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-desktop", "ros2-rolling-full", "ros2-rolling-gazebo" ] }
group "ros2-rolling-linux-arm64" { targets = [ "ros2-rolling-base" ] }


group "ros2-rolling-cuda-linux-amd64" { targets = [ "ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo" ] }
group "ros2-rolling-cuda-linux-amd64" { targets = [ "ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-desktop", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo" ] }


group "ros2-kilted-linux-amd64" { targets = [ "ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-full", "ros2-kilted-gazebo" ] }
group "ros2-kilted-linux-amd64" { targets = [ "ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-desktop", "ros2-kilted-full", "ros2-kilted-gazebo" ] }
group "ros2-kilted-linux-arm64" { targets = [ "ros2-kilted-base" ] }


group "ros2-jazzy-linux-amd64" { targets = [ "ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-full", "ros2-jazzy-gazebo" ] }
group "ros2-jazzy-linux-amd64" { targets = [ "ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-desktop", "ros2-jazzy-full", "ros2-jazzy-gazebo" ] }
group "ros2-jazzy-linux-arm64" { targets = [ "ros2-jazzy-base" ] }


group "ros2-jazzy-cuda-linux-amd64" { targets = [ "ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo" ] }
group "ros2-jazzy-cuda-linux-amd64" { targets = [ "ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-desktop", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo" ] }


group "ros2-humble-linux-amd64" { targets = [ "ros2-humble-base", "ros2-humble-dev", "ros2-humble-full", "ros2-humble-gazebo" ] }
group "ros2-humble-linux-arm64" { targets = [ "ros2-humble-base", "ros2-humble-dev", "ros2-humble-full" ] }
group "ros2-humble-linux-amd64" { targets = [ "ros2-humble-base", "ros2-humble-dev", "ros2-humble-desktop", "ros2-humble-full", "ros2-humble-gazebo" ] }
group "ros2-humble-linux-arm64" { targets = [ "ros2-humble-base", "ros2-humble-dev", "ros2-humble-desktop", "ros2-humble-full" ] }


group "ros2-humble-cuda-linux-amd64" { targets = [ "ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo" ] }
group "ros2-humble-cuda-linux-amd64" { targets = [ "ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-desktop", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo" ] }


group "ignition-fortress-linux-amd64" { targets = [ "ignition-fortress-base", "ignition-fortress-dev" ] }
Expand All @@ -531,14 +594,14 @@ group "gz-harmonic-cuda-linux-amd64" { targets = [ "gz-harmonic-cuda-base", "gz-
# ---------- Family-level groups (e.g., ros2, gz, ignition) ----------

group "ros" { targets = [ ] }
group "ros2" { targets = [ "ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-full", "ros2-rolling-gazebo", "ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo", "ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-full", "ros2-kilted-gazebo", "ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-full", "ros2-jazzy-gazebo", "ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo", "ros2-humble-base", "ros2-humble-dev", "ros2-humble-full", "ros2-humble-gazebo", "ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo" ] }
group "ros2" { targets = [ "ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-desktop", "ros2-rolling-full", "ros2-rolling-gazebo", "ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-desktop", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo", "ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-desktop", "ros2-kilted-full", "ros2-kilted-gazebo", "ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-desktop", "ros2-jazzy-full", "ros2-jazzy-gazebo", "ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-desktop", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo", "ros2-humble-base", "ros2-humble-dev", "ros2-humble-desktop", "ros2-humble-full", "ros2-humble-gazebo", "ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-desktop", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo" ] }
group "gazebo" { targets = [ ] }
group "ignition" { targets = [ "ignition-fortress-base", "ignition-fortress-dev" ] }
group "gz" { targets = [ "gz-jetty-base", "gz-jetty-dev", "gz-jetty-cuda-base", "gz-jetty-cuda-dev", "gz-ionic-base", "gz-ionic-dev", "gz-ionic-cuda-base", "gz-ionic-cuda-dev", "gz-harmonic-base", "gz-harmonic-dev", "gz-harmonic-cuda-base", "gz-harmonic-cuda-dev" ] }

# ---- all non-EOL ----
group "default" {
targets = [
"ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-full", "ros2-rolling-gazebo", "ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo", "ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-full", "ros2-kilted-gazebo", "ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-full", "ros2-jazzy-gazebo", "ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo", "ros2-humble-base", "ros2-humble-dev", "ros2-humble-full", "ros2-humble-gazebo", "ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo", "ignition-fortress-base", "ignition-fortress-dev", "gz-jetty-base", "gz-jetty-dev", "gz-jetty-cuda-base", "gz-jetty-cuda-dev", "gz-ionic-base", "gz-ionic-dev", "gz-ionic-cuda-base", "gz-ionic-cuda-dev", "gz-harmonic-base", "gz-harmonic-dev", "gz-harmonic-cuda-base", "gz-harmonic-cuda-dev"
"ros2-rolling-base", "ros2-rolling-dev", "ros2-rolling-desktop", "ros2-rolling-full", "ros2-rolling-gazebo", "ros2-rolling-cuda-base", "ros2-rolling-cuda-dev", "ros2-rolling-cuda-desktop", "ros2-rolling-cuda-full", "ros2-rolling-cuda-gazebo", "ros2-kilted-base", "ros2-kilted-dev", "ros2-kilted-desktop", "ros2-kilted-full", "ros2-kilted-gazebo", "ros2-jazzy-base", "ros2-jazzy-dev", "ros2-jazzy-desktop", "ros2-jazzy-full", "ros2-jazzy-gazebo", "ros2-jazzy-cuda-base", "ros2-jazzy-cuda-dev", "ros2-jazzy-cuda-desktop", "ros2-jazzy-cuda-full", "ros2-jazzy-cuda-gazebo", "ros2-humble-base", "ros2-humble-dev", "ros2-humble-desktop", "ros2-humble-full", "ros2-humble-gazebo", "ros2-humble-cuda-base", "ros2-humble-cuda-dev", "ros2-humble-cuda-desktop", "ros2-humble-cuda-full", "ros2-humble-cuda-gazebo", "ignition-fortress-base", "ignition-fortress-dev", "gz-jetty-base", "gz-jetty-dev", "gz-jetty-cuda-base", "gz-jetty-cuda-dev", "gz-ionic-base", "gz-ionic-dev", "gz-ionic-cuda-base", "gz-ionic-cuda-dev", "gz-harmonic-base", "gz-harmonic-dev", "gz-harmonic-cuda-base", "gz-harmonic-cuda-dev"
]
}
4 changes: 4 additions & 0 deletions ros/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,31 @@ noetic (eol)

* [noetic-base](https://github.com/athackst/dockerfiles/blob/main/ros/noetic.Dockerfile)
* [noetic-dev](https://github.com/athackst/dockerfiles/blob/main/ros/noetic.Dockerfile)
* [noetic-desktop](https://github.com/athackst/dockerfiles/blob/main/ros/noetic.Dockerfile)
* [noetic-full](https://github.com/athackst/dockerfiles/blob/main/ros/noetic.Dockerfile)
* [noetic-gazebo](https://github.com/athackst/dockerfiles/blob/main/ros/noetic.Dockerfile)

melodic (eol)

* [melodic-base](https://github.com/athackst/dockerfiles/blob/main/ros/melodic.Dockerfile)
* [melodic-dev](https://github.com/athackst/dockerfiles/blob/main/ros/melodic.Dockerfile)
* [melodic-desktop](https://github.com/athackst/dockerfiles/blob/main/ros/melodic.Dockerfile)
* [melodic-full](https://github.com/athackst/dockerfiles/blob/main/ros/melodic.Dockerfile)
* [melodic-gazebo](https://github.com/athackst/dockerfiles/blob/main/ros/melodic.Dockerfile)

lunar (eol)

* [lunar-base](https://github.com/athackst/dockerfiles/blob/main/ros/lunar.Dockerfile)
* [lunar-dev](https://github.com/athackst/dockerfiles/blob/main/ros/lunar.Dockerfile)
* [lunar-desktop](https://github.com/athackst/dockerfiles/blob/main/ros/lunar.Dockerfile)
* [lunar-full](https://github.com/athackst/dockerfiles/blob/main/ros/lunar.Dockerfile)
* [lunar-gazebo](https://github.com/athackst/dockerfiles/blob/main/ros/lunar.Dockerfile)

kinetic (eol)

* [kinetic-base](https://github.com/athackst/dockerfiles/blob/main/ros/kinetic.Dockerfile)
* [kinetic-dev](https://github.com/athackst/dockerfiles/blob/main/ros/kinetic.Dockerfile)
* [kinetic-desktop](https://github.com/athackst/dockerfiles/blob/main/ros/kinetic.Dockerfile)
* [kinetic-full](https://github.com/athackst/dockerfiles/blob/main/ros/kinetic.Dockerfile)
* [kinetic-gazebo](https://github.com/athackst/dockerfiles/blob/main/ros/kinetic.Dockerfile)

Expand Down
Loading
Loading