Revamp nvidia-dind to Ubuntu 24.04

.github/workflows/container-publish.yml

@@ -1,3 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+name: Publish container
+
 on:
   workflow_dispatch:
   push:
@@ -9,30 +15,55 @@ env:
   IMAGE_NAME: ehfd/nvidia-dind
 jobs:
   build:
+    name: Build and push Ubuntu ${{ matrix.os_version }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
+    strategy:
+      matrix:
+        include:
+        - os_version: "20.04"
+        - os_version: "22.04"
+        - os_version: "24.04"
+          latest_tag: true
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+
+    - name: Fetch commit time
+      run: echo "COMMIT_TIME_GIT=$(TZ=UTC git show -s --format='%cd' --date=format-local:'%Y%m%d%H%M%S')" >> "$GITHUB_ENV"
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
     - name: Log into registry ${{ env.REGISTRY }}
-      if: github.event_name != 'pull_request'
+      if: ${{ github.event_name != 'pull_request' }}
       uses: docker/login-action@v3
       with:
         registry: ${{ env.REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Extract Container metadata
+
+    - name: Extract container metadata
       id: meta
       uses: docker/metadata-action@v5
       with:
         images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-    - name: Build and push Container image
+
+    - name: Build and push Ubuntu ${{ matrix.os_version }} container image
       uses: docker/build-push-action@v5
       with:
+        build-args: |
+          DISTRIB_RELEASE=${{ matrix.os_version }}
         context: .
+        labels: ${{ steps.meta.outputs.labels }}
+        no-cache: true
         push: ${{ github.event_name != 'pull_request' }}
         tags: |
-          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
-        labels: ${{ steps.meta.outputs.labels }}
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.os_version }}
+          ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ matrix.os_version }}-${{ env.COMMIT_TIME_GIT }}
+          ${{ matrix.latest_tag && format('{0}/{1}:latest', env.REGISTRY, env.IMAGE_NAME) || '' }}

Dockerfile

@@ -1,11 +1,15 @@
-ARG UBUNTU_RELEASE=22.04
-FROM ubuntu:${UBUNTU_RELEASE}
-
-LABEL maintainer "https://github.com/ehfd"
-
-ARG UBUNTU_RELEASE
-
-RUN apt-get clean && apt-get update && apt-get upgrade -y && apt-get install --no-install-recommends -y \
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# Supported base images: Ubuntu 24.04, 22.04, 20.04
+ARG DISTRIB_IMAGE=ubuntu
+ARG DISTRIB_RELEASE=24.04
+FROM ${DISTRIB_IMAGE}:${DISTRIB_RELEASE}
+ARG DISTRIB_IMAGE
+ARG DISTRIB_RELEASE
+
+RUN apt-get clean && apt-get update && apt-get dist-upgrade -y && apt-get install --no-install-recommends -y \
         apt-transport-https \
         apt-utils \
         ca-certificates \
@@ -17,30 +21,26 @@ RUN apt-get clean && apt-get update && apt-get upgrade -y && apt-get install --n
         software-properties-common \
         supervisor \
         wget && \
-    rm -rf /var/lib/apt/list/*
+    apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/debconf/* /var/log/* /tmp/* /var/tmp/* && \
 
 # NVIDIA Container Toolkit and Docker
-RUN mkdir -pm755 /etc/apt/keyrings && curl -fsSL "https://download.docker.com/linux/ubuntu/gpg" | gpg --dearmor -o /etc/apt/keyrings/docker.gpg && chmod a+r /etc/apt/keyrings/docker.gpg && \
-    mkdir -pm755 /etc/apt/sources.list.d && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2 | tr -d '\"') stable" > /etc/apt/sources.list.d/docker.list && \
-    mkdir -pm755 /usr/share/keyrings && curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg && \
-    curl -fsSL "https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list" | sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | tee /etc/apt/sources.list.d/nvidia-container-toolkit.list > /dev/null && \
+RUN mkdir -pm755 /etc/apt/keyrings && curl -o /etc/apt/keyrings/docker.asc -fsSL "https://download.docker.com/linux/ubuntu/gpg" && chmod a+r /etc/apt/keyrings/docker.asc && \
+    mkdir -pm755 /etc/apt/sources.list.d && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(grep UBUNTU_CODENAME= /etc/os-release | cut -d= -f2 | tr -d '\"') stable" > /etc/apt/sources.list.d/docker.list && \
+    mkdir -pm755 /usr/share/keyrings && curl -fsSL "https://nvidia.github.io/libnvidia-container/gpgkey" | gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg && \
+    curl -fsSL "https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list" | sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' > /etc/apt/sources.list.d/nvidia-container-toolkit.list && \
     apt-get update && apt-get install --no-install-recommends -y \
         docker-ce \
         docker-ce-cli \
         containerd.io \
         docker-buildx-plugin \
         docker-compose-plugin \
         nvidia-container-toolkit && \
-    rm -rf /var/lib/apt/list/* && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /var/cache/debconf/* /var/log/* /tmp/* /var/tmp/* && \
     nvidia-ctk runtime configure --runtime=docker
 
-COPY modprobe start-docker.sh entrypoint.sh /usr/local/bin/
-COPY supervisor/ /etc/supervisor/conf.d/
-COPY logger.sh /opt/bash-utils/logger.sh
-
-RUN chmod +x /usr/local/bin/start-docker.sh /usr/local/bin/entrypoint.sh /usr/local/bin/modprobe
+COPY modprobe entrypoint.sh /usr/local/bin/
+RUN chmod -f 755 /usr/local/bin/entrypoint.sh /usr/local/bin/modprobe
 
 VOLUME /var/lib/docker
 
-ENTRYPOINT ["entrypoint.sh"]
-CMD ["bash"]
+ENTRYPOINT ["/usr/bin/supervisord"]