update docker files

BigNoobWasTaken · BigNoobWasTaken · commit 150f1a85d122 · 2025-08-05T04:32:16.000Z
diff --git a/.github/workflows/docker-publish-d.yml b/.github/workflows/docker-publish-d.yml
@@ -9,6 +9,9 @@ jobs:
   push_to_registry:
     name: Push Docker image
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        image-tag: [ "CUDA-12.9.1-Ubuntu-2004", "CUDA-12.9.1-devel-ubi8" ]
     permissions:
       packages: write
       contents: read
@@ -28,7 +31,8 @@ jobs:
       id: meta
       uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804
       with:
-        image: noobwastaken/tensor-array
+        image: ${{ secrets.DOCKER_USERNAME }}/tensor-array
+        tags: ${{ matrix.image-tag }}
 
     - name: Build and push Docker images
       id: push
@@ -43,6 +47,6 @@ jobs:
     - name: Attest Build Provenance
       uses: actions/attest-build-provenance@v2
       with:
-        subject-name: index.docker.io/noobwastaken/tensor-array
+        subject-name: index.docker.io/${{ secrets.DOCKER_USERNAME }}/tensor-array
         subject-digest: ${{ steps.push.outputs.digest }}
         push-to-registry: true
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image-os: [ "Ubuntu" ]
+        image-tag: [ "CUDA-12.9.1-Ubuntu-20.04", "CUDA-12.9.1-devel-ubi8" ]
     
     runs-on: ubuntu-22.04
     
@@ -73,15 +73,16 @@ jobs:
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: ${{ matrix.image-os }}
+          tags: |
+            type=raw,value=${{ matrix.image-tag }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
-          file: Dockerfolder/${{ matrix.image-os }}.Dockerfile
+          file: Dockerfolder/${{ matrix.image-tag }}.Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfolder/CUDA-12.9.1-Ubuntu-20.04.Dockerfile b/Dockerfolder/CUDA-12.9.1-Ubuntu-20.04.Dockerfile
@@ -1,4 +1,4 @@
-FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubuntu20.04
 
 RUN apt-get update
 RUN apt-get upgrade -y
@@ -30,5 +30,6 @@ WORKDIR tensor-array/build
 RUN cmake ..
 RUN cmake --build .
 RUN cmake --install .
+RUN ctest
 
-WORKDIR /app/tensor-array
+WORKDIR ..
diff --git a/Dockerfolder/CUDA-12.9.1-ubi8.Dockerfile b/Dockerfolder/CUDA-12.9.1-ubi8.Dockerfile
@@ -0,0 +1,35 @@
+FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubi8
+
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install curl -y
+
+ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.27.9"
+
+# Optionally install the cmake for vcpkg
+COPY scripts/packages-install/reinstall-cmake.sh /tmp/
+
+RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
+        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
+    fi \
+    && rm -f /tmp/reinstall-cmake.sh
+
+
+# [Optional] Uncomment this section to install additional vcpkg ports.
+# RUN su vscode -c "${VCPKG_ROOT}/vcpkg install <your-port-name-here>"
+
+# [Optional] Uncomment this section to install additional packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+WORKDIR /main-project
+COPY ./ tensor-array/
+
+WORKDIR tensor-array/build
+
+RUN cmake ..
+RUN cmake --build .
+RUN cmake --install .
+RUN ctest
+
+WORKDIR ..
