diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 13a156b..e23b4f8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -35,11 +35,11 @@ jobs: platforms: linux/amd64 build-args: BUILD_TYPE=default - - name: Build and push nvidia image - uses: docker/build-push-action@v4 - with: - context: . - push: true - tags: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:base-nv - platforms: linux/amd64 - build-args: BUILD_TYPE=nvidia \ No newline at end of file +# - name: Build and push nvidia image +# uses: docker/build-push-action@v4 +# with: +# context: . +# push: true +# tags: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}:base-nv +# platforms: linux/amd64 +# build-args: BUILD_TYPE=nvidia \ No newline at end of file diff --git a/DockerfileUpgradeNvidia b/DockerfileUpgradeNvidia index 8690d13..8dd8195 100644 --- a/DockerfileUpgradeNvidia +++ b/DockerfileUpgradeNvidia @@ -1,10 +1,12 @@ -FROM ghcr.io/alt-gnome/alt-atomic:base-nv +FROM ghcr.io/skywar-design/alt-atomic:base RUN apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* && \ - mkdir /var/lib/apt/lists/partial + apt-get dist-upgrade -y RUN --mount=type=bind,source=./src,target=/src \ - /src/make/atomic-actions.sh \ No newline at end of file + /src/make/atomic-actions.sh && \ + /src/packages/components/nvidia/packages.sh && \ + /src/configuration/nvidia.sh && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* && \ + mkdir /var/lib/apt/lists/partial \ No newline at end of file diff --git a/src/packages/components/nvidia/packages.sh b/src/packages/components/nvidia/packages.sh index f9e1a14..96010b7 100755 --- a/src/packages/components/nvidia/packages.sh +++ b/src/packages/components/nvidia/packages.sh @@ -6,6 +6,6 @@ echo "Installing nvidia packages" apt-get install -y apt-repo-lakostis-kmodules apt-repo-lakostis && \ apt-get update && \ -apt-get install -y kernel-modules-nvidia-open-6.12 libnvidia-opencl libnvoptix cuda-libs +apt-get install -y kernel-modules-nvidia-open-6.12 nvidia_glx libnvoptix echo "End installing nvidia packages" \ No newline at end of file