VNC Container Implementation

.github/ISSUE_TEMPLATE/request-variant.yaml

@@ -0,0 +1,75 @@
+name: "Request New Image Variant"
+description: "Request a new variant based on the images scaffolded by this repository (e.g. ROS / CUDA variants)."
+title: "[Variant]: "
+labels:
+  - "enhancement"
+  - "feature request"
+body:
+  - type: textarea
+    id: why
+    attributes:
+      label: "Explain Your Problem"
+      description: "What problem does this solve? Why can't you use an existing image that is produced from this repository?"
+    validations:
+      required: true
+
+  - type: input
+    id: ros_version
+    attributes:
+      label: "ROS 2 Distro"
+      placeholder: "humble"
+
+  - type: dropdown
+    id: rep2001
+    attributes:
+      label: "Is the ROS 2 version a LTS variant?"
+      description: "See [REP-2001](https://www.ros.org/reps/rep-2001.html)"
+      options:
+        - "Yes"
+        - "No"
+
+  - type: input
+    id: ubuntu_version
+    attributes:
+      label: "Ubuntu version"
+      placeholder: "22.04"
+
+  - type: checkboxes
+    id: ubuntu_lts
+    attributes:
+      label: "Is Ubuntu LTS?"
+      options:
+        - label: "Yes (LTS)"
+
+  - type: textarea
+    id: non_lts_justification
+    attributes:
+      label: "If not a Ubuntu LTS, please justify why you need this version."
+
+  - type: checkboxes
+    id: cuda_needed
+    attributes:
+      label: "Is NVIDIA CUDA needed?"
+      description: "CUDA will make the images much larger and should only be used for 'AI' workloads that will take advantage of CUDA"
+      options:
+        - label: "Yes, I need to use CUDA in this container"
+
+  - type: input
+    id: cuda_version
+    attributes:
+      label: "If yes, what CUDA version do you need?"
+      description: "If you are using your own machine, run `nvidia-smi` and see what version you are using or state latest."
+      placeholder: "13.2.0"
+
+  - type: input
+    id: cuda_base_tag
+    attributes:
+      label: "What is your proposed NVIDIA base image to use? (optional)"
+      description: "From [NVIDIA supported tags list](https://gitlab.com/nvidia/container-images/cuda/-/blob/master/doc/supported-tags.md)."
+      placeholder: "13.2.0-cudnn-runtime-ubuntu22.04"
+
+  - type: textarea
+    id: use_case
+    attributes:
+      label: "What is your use case?"
+      description: "Provide us with information and links of how you expect to be using this."

.github/workflows/_build-ros-image.yaml

@@ -0,0 +1,133 @@
+name: Build a single ROS Docker image (reusable)
+
+on:
+  workflow_call:
+    inputs:
+      base_image:
+        description: The FROM base image
+        required: true
+        type: string
+      push_image:
+        description: Image name on the LCAS registry
+        required: true
+        type: string
+      tag_stem:
+        description: "Base image tag stem (example: humble-11.8)"
+        required: true
+        type: string
+      image_context:
+        description: "Tag context suffix (main, release tag, or staging)"
+        required: true
+        type: string
+      ros_distro:
+        description: ROS distro to build for (for tags/build args)
+        required: true
+        type: string
+      dockerfile:
+        required: true
+        type: string
+      architectures:
+        required: true
+        type: string
+      build_desktop:
+        description: Build a desktop variant after the primary image?
+        required: false
+        default: false
+        type: boolean
+      desktop_push_image:
+        description: Desktop image name on the LCAS registry, i.e. ros_cuda_desktop
+        required: false
+        default: ""
+        type: string
+    outputs:
+      digest:
+        description: Image digest from the build
+        value: ${{ jobs.build.outputs.digest }}
+    secrets:
+      LCAS_REGISTRY_PUSHER:
+        required: true
+      LCAS_REGISTRY_TOKEN:
+        required: true
+
+jobs:
+  build:
+    runs-on: [lcas, qemu]
+    outputs:
+      digest: ${{ steps.build.outputs.digest }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: docker/login-action@v4
+        with:
+          registry: lcas.lincoln.ac.uk
+          username: ${{ secrets.LCAS_REGISTRY_PUSHER }}
+          password: ${{ secrets.LCAS_REGISTRY_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v6
+        with:
+          flavor: latest=false
+          labels: |
+            org.opencontainers.image.description=AOC Docker Image (${{ inputs.push_image }}, ${{ inputs.ros_distro }})
+            org.opencontainers.image.authors=L-CAS Team
+          images: lcas.lincoln.ac.uk/${{ inputs.push_image }}
+          tags: |
+            type=raw,value=${{ inputs.tag_stem }}-${{ inputs.image_context }}
+            type=semver,pattern={{version}},prefix=${{ inputs.tag_stem }}-
+            type=semver,pattern={{major}}.{{minor}},prefix=${{ inputs.tag_stem }}-
+            type=semver,pattern={{major}},prefix=${{ inputs.tag_stem }}-
+
+      - uses: docker/setup-buildx-action@v4
+
+      - name: Build and push
+        id: build
+        uses: docker/build-push-action@v7
+        with:
+          context: ./docker
+          file: ./${{ inputs.dockerfile }}
+          platforms: ${{ inputs.architectures }}
+          push: true
+          cache-from: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.tag_stem }}
+          cache-to: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.tag_stem }},mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            BASE_IMAGE=${{ inputs.base_image }}
+            ROS_DISTRO=${{ inputs.ros_distro }}
+
+      #####
+
+      - name: Docker meta desktop
+        if: ${{ inputs.build_desktop && inputs.desktop_push_image != '' }}
+        id: meta_desktop
+        uses: docker/metadata-action@v6
+        with:
+          flavor: latest=false
+          labels: |
+            org.opencontainers.image.description=AOC Docker Image (${{ inputs.desktop_push_image }}, ${{ inputs.ros_distro }} desktop)
+            org.opencontainers.image.authors=L-CAS Team
+          images: lcas.lincoln.ac.uk/${{ inputs.desktop_push_image }}
+          tags: |
+            type=raw,value=${{ inputs.tag_stem }}-${{ inputs.image_context }}
+            type=semver,pattern={{version}},prefix=${{ inputs.tag_stem }}-
+            type=semver,pattern={{major}}.{{minor}},prefix=${{ inputs.tag_stem }}-
+            type=semver,pattern={{major}},prefix=${{ inputs.tag_stem }}-
+
+      - name: Build and push desktop
+        if: ${{ inputs.build_desktop && inputs.desktop_push_image != '' }}
+        id: build_desktop
+        uses: docker/build-push-action@v7
+        with:
+          context: ./docker
+          file: ./desktop.dockerfile
+          platforms: ${{ inputs.architectures }}
+          push: true
+          cache-from: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.desktop_push_image }}:${{ inputs.tag_stem }}
+          cache-to: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.desktop_push_image }}:${{ inputs.tag_stem }},mode=max
+          tags: ${{ steps.meta_desktop.outputs.tags }}
+          labels: ${{ steps.meta_desktop.outputs.labels }}
+          build-args: |
+            BASE_IMAGE=lcas.lincoln.ac.uk/${{ inputs.push_image }}@${{ steps.build.outputs.digest }}
+            ROS_DISTRO=${{ inputs.ros_distro }}
+

.github/workflows/_build-image.yaml → .github/workflows/_build-standalone-image.yaml

@@ -1,4 +1,4 @@
-name: Build a single Docker image (reusable)
+name: Build a single standalone Docker image (reusable)
 
 on:
   workflow_call:
@@ -11,9 +11,6 @@ on:
         description: Image name on the LCAS registry
         required: true
         type: string
-      ros_distro:
-        required: true
-        type: string
       dockerfile:
         required: true
         type: string
@@ -36,11 +33,9 @@ jobs:
     outputs:
       digest: ${{ steps.build.outputs.digest }}
     steps:
-      - uses: actions/setup-node@v4
-      - uses: actions/checkout@v3
-      - run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
+      - uses: actions/checkout@v6
 
-      - uses: docker/login-action@v3
+      - uses: docker/login-action@v4
         with:
           registry: lcas.lincoln.ac.uk
           username: ${{ secrets.LCAS_REGISTRY_PUSHER }}
@@ -51,35 +46,34 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           flavor: latest=false
           labels: |
-            org.opencontainers.image.description=AOC Docker Image (${{ inputs.push_image }}, ${{ inputs.ros_distro }})
+            org.opencontainers.image.description=AOC Docker Image (${{ inputs.push_image }})
             org.opencontainers.image.authors=L-CAS Team
           images: lcas.lincoln.ac.uk/${{ inputs.push_image }}
           tags: |
-            type=raw,value=${{ inputs.ros_distro }}-staging
-            type=raw,enable=${{ github.event_name != 'pull_request' }},value=${{ inputs.ros_distro }}-latest
-            type=ref,enable=${{ github.event_name != 'pull_request' }},event=branch,prefix=${{ inputs.ros_distro }}-
-            type=semver,pattern={{version}},prefix=${{ inputs.ros_distro }}-
-            type=semver,pattern={{major}}.{{minor}},prefix=${{ inputs.ros_distro }}-
-            type=semver,pattern={{major}},prefix=${{ inputs.ros_distro }}-
+            type=raw,enable=${{ github.ref_name == 'main' }},value=main
+            type=raw,enable=${{ github.ref_name == 'main' }},value=latest
+            type=raw,enable=${{ github.ref_name != 'main' }},value=staging
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
 
-      - uses: docker/setup-buildx-action@v3
+      - uses: docker/setup-buildx-action@v4
 
       - name: Build and push
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: ./docker
           file: ./${{ inputs.dockerfile }}
           platforms: ${{ inputs.architectures }}
           push: true
-          cache-from: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.ros_distro }}
-          cache-to:   type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:${{ inputs.ros_distro }},mode=max
+          cache-from: type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:latest
+          cache-to:   type=registry,ref=lcas.lincoln.ac.uk/cache/${{ inputs.push_image }}:latest,mode=max
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
             BASE_IMAGE=${{ inputs.base_image }}
-            ROS_DISTRO=${{ inputs.ros_distro }}