Merge pull request lllyasviel#265 from ayan4m1/fix/docker-images

Build Docker images for CUDA 12.4/6/8 and include patch version in specifier

Author: colinurbs

.github/actions/docker-publish-action/action.yml

@@ -34,14 +34,26 @@ runs:
       uses: docker/metadata-action@v5
       with:
         images: ${{ inputs.image_name }}
+    - name: Trim Commit SHA
+      uses: 2428392/gh-truncate-string-action@v1
+      id: trimCommitSha
+      with:
+        stringToTruncate: "${{ inputs.commit_sha }}"
+        maxLength: 8
+    - name: Trim CUDA version
+      uses: 2428392/gh-truncate-string-action@v1
+      id: trimCudaVersion
+      with:
+        stringToTruncate: "${{ inputs.cuda_version }}"
+        maxLength: 4
     - name: Build and push
       uses: docker/build-push-action@v5
       with:
         push: true
         file: Dockerfile
         tags: |
-          ${{ inputs.image_name }}:cuda${{ inputs.cuda_version }}-latest-${{ inputs.branch }}
-          ${{ inputs.image_name }}:cuda${{ inputs.cuda_version }}-${{ inputs.commit_sha }}
+          ${{ inputs.image_name }}:cuda${{ steps.trimCudaVersion.outputs.string }}-latest${{ inputs.branch == "main" && '' || join('-', inputs.branch) }}
+          ${{ inputs.image_name }}:cuda${{ steps.trimCudaVersion.outputs.string }}-${{ steps.trimCommitSha.outputs.string }}
         labels: ${{ steps.meta.outputs.labels }}
         build-args: |
           CUDA_VERSION=${{ inputs.cuda_version }}

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
       packages: write
     strategy:
       matrix:
-        cuda-version: ["12.9", "12.8", "12.4"]
+        cuda-version: ["12.4.1", "12.6.3", "12.8.1"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -30,5 +30,5 @@ jobs:
           commit_sha: ${{ github.sha }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          image_name: colinurbs439/fp-studio
+          image_name: colinurbs/fp-studio
           cuda_version: ${{ matrix.cuda-version }}

Dockerfile

@@ -1,6 +1,6 @@
-ARG CUDA_VERSION=12.4
+ARG CUDA_VERSION=12.4.1
 
-FROM nvidia/cuda:${CUDA_VERSION}.0-runtime-ubuntu22.04
+FROM nvidia/cuda:${CUDA_VERSION}-runtime-ubuntu24.04
 
 ARG CUDA_VERSION
 

docker-compose.yml

@@ -1,7 +1,11 @@
 services:
   studio:
-    build: .
-    image: colinurbs/fp-studio:cuda12.9-latest-develop
+    build:
+      # modify this if you are building the image locally and need a different CUDA version
+      args:
+        - CUDA_VERSION=12.4.1
+    # modify the tag here if you need a different CUDA version or branch
+    image: colinurbs/fp-studio:cuda12.4-latest-develop
     restart: unless-stopped
     ports:
       - "7860:7860"