Skip to content

Commit 66aed27

Browse files
authored
chore: update from ros_dist to ros_distro added to readme description of images produced
1 parent 0591fb5 commit 66aed27

File tree

3 files changed

+25
-18
lines changed

3 files changed

+25
-18
lines changed

.github/workflows/_build-image.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
description: Image name on the LCAS registry
1212
required: true
1313
type: string
14-
ros_dist:
14+
ros_distro:
1515
required: true
1616
type: string
1717
dockerfile:
@@ -52,16 +52,16 @@ jobs:
5252
with:
5353
flavor: latest=false
5454
labels: |
55-
org.opencontainers.image.description=AOC Docker Image (${{ inputs.push_image }}, ${{ inputs.ros_dist }})
55+
org.opencontainers.image.description=AOC Docker Image (${{ inputs.push_image }}, ${{ inputs.ros_distro }})
5656
org.opencontainers.image.authors=L-CAS Team
5757
images: lcas.lincoln.ac.uk/${{ inputs.push_image }}
5858
tags: |
59-
type=raw,value=${{ inputs.ros_dist }}-staging
60-
type=raw,enable=${{ github.event_name != 'pull_request' }},value=${{ inputs.ros_dist }}-latest
61-
type=ref,enable=${{ github.event_name != 'pull_request' }},event=branch,prefix=${{ inputs.ros_dist }}-
62-
type=semver,pattern={{version}},prefix=${{ inputs.ros_dist }}-
63-
type=semver,pattern={{major}}.{{minor}},prefix=${{ inputs.ros_dist }}-
64-
type=semver,pattern={{major}},prefix=${{ inputs.ros_dist }}-
59+
type=raw,value=${{ inputs.ros_distro }}-staging
60+
type=raw,enable=${{ github.event_name != 'pull_request' }},value=${{ inputs.ros_distro }}-latest
61+
type=ref,enable=${{ github.event_name != 'pull_request' }},event=branch,prefix=${{ inputs.ros_distro }}-
62+
type=semver,pattern={{version}},prefix=${{ inputs.ros_distro }}-
63+
type=semver,pattern={{major}}.{{minor}},prefix=${{ inputs.ros_distro }}-
64+
type=semver,pattern={{major}},prefix=${{ inputs.ros_distro }}-
6565
6666
- uses: docker/setup-buildx-action@v3
6767

@@ -73,10 +73,10 @@ jobs:
7373
file: ./${{ inputs.dockerfile }}
7474
platforms: ${{ inputs.architectures }}
7575
push: true
76-
cache-from: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.ros_dist }}
77-
cache-to: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.ros_dist }},mode=max
76+
cache-from: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.ros_distro }}
77+
cache-to: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.ros_distro }},mode=max
7878
tags: ${{ steps.meta.outputs.tags }}
7979
labels: ${{ steps.meta.outputs.labels }}
8080
build-args: |
8181
BASE_IMAGE=${{ inputs.base_image }}
82-
ROS_DISTRO=${{ inputs.ros_dist }}
82+
ROS_DISTRO=${{ inputs.ros_distro }}

.github/workflows/docker-build-and-push.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
base_image: ros:humble
1919
push_image: ros
20-
ros_dist: humble
20+
ros_distro: humble
2121
dockerfile: base.dockerfile
2222
architectures: linux/amd64,linux/arm64
2323
secrets: inherit
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
base_image: ros:jazzy
2929
push_image: ros
30-
ros_dist: jazzy
30+
ros_distro: jazzy
3131
dockerfile: base.dockerfile
3232
architectures: linux/amd64,linux/arm64
3333
secrets: inherit
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
base_image: nvidia/cuda:11.8.0-runtime-ubuntu22.04
3939
push_image: ros_cuda
40-
ros_dist: humble
40+
ros_distro: humble
4141
dockerfile: cuda.dockerfile
4242
architectures: linux/amd64
4343
secrets: inherit
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
base_image: nvidia/cuda:12.6.3-cudnn-devel-ubuntu24.04
4949
push_image: ros_cuda
50-
ros_dist: jazzy
50+
ros_distro: jazzy
5151
dockerfile: cuda.dockerfile
5252
architectures: linux/amd64
5353
secrets: inherit
@@ -61,7 +61,7 @@ jobs:
6161
# Digest is immutable — no staging tag, no race condition, no cleanup
6262
base_image: lcas.lincoln.ac.uk/ros_cuda@${{ needs.ros-cuda-humble.outputs.digest }}
6363
push_image: ros_cuda_desktop
64-
ros_dist: humble
64+
ros_distro: humble
6565
dockerfile: cuda_desktop.dockerfile
6666
architectures: linux/amd64
6767
secrets: inherit
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
base_image: lcas.lincoln.ac.uk/ros_cuda@${{ needs.ros-cuda-jazzy.outputs.digest }}
7474
push_image: ros_cuda_desktop
75-
ros_dist: jazzy
75+
ros_distro: jazzy
7676
dockerfile: cuda_desktop.dockerfile
7777
architectures: linux/amd64
7878
secrets: inherit

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
# aoc_container_base
2-
A repository of verstile ROS-enabled Docker containers
2+
3+
A repository of verstile ROS-enabled Docker containers, orginally developed as apart of the [Agri-OpenCore (AOC) project](https://agri-opencore.org).
4+
5+
| Container Name | Tags | Purpose |
6+
| ------------------------------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
7+
| `lcas.lincoln.ac.uk/ros` | { `humble`, `jazzy` } | Base ROS Container, the minimal environment you need for ROS |
8+
| `lcas.lincoln.ac.uk/ros_cuda` | { `humble`, `jazzy` } | ROS + Nvidia. When you need to use a GPU in your ROS environment for either better quality simulation or AI workloads. |
9+
| `lcas.lincoln.ac.uk/ros_cuda_desktop` | { `humble`, `jazzy` } | ROS + Nvidia + Packages. Installs the `ros-{distro}-desktop` varient so there is the full ROS stack available. |

0 commit comments

Comments
 (0)