diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 393559cac..707fad5f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: [ ".github/workflows/**", ".dockerignore", - "Dockerfile*", + "docker/Dockerfile*", "**/CMakeLists.txt", "**/Makefile", "**/*.h", @@ -32,7 +32,7 @@ on: [ ".github/workflows/**", ".dockerignore", - "Dockerfile*", + "docker/Dockerfile*", "**/CMakeLists.txt", "**/Makefile", "**/*.h", @@ -264,7 +264,7 @@ jobs: context: . platforms: ${{ matrix.platform }} push: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/master' ) || github.event.inputs.create_release == 'true' }} - file: Dockerfile.${{ matrix.variant }} + file: docker/Dockerfile.${{ matrix.variant }} tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.BRANCH_NAME }}-${{ matrix.variant }}${{ matrix.tag-suffix }} labels: ${{ steps.meta.outputs.labels }} annotations: ${{ steps.meta.outputs.annotations }} diff --git a/Dockerfile b/docker/Dockerfile similarity index 100% rename from Dockerfile rename to docker/Dockerfile diff --git a/Dockerfile.cuda b/docker/Dockerfile.cuda similarity index 100% rename from Dockerfile.cuda rename to docker/Dockerfile.cuda diff --git a/Dockerfile.musa b/docker/Dockerfile.musa similarity index 100% rename from Dockerfile.musa rename to docker/Dockerfile.musa diff --git a/Dockerfile.sycl b/docker/Dockerfile.sycl similarity index 100% rename from Dockerfile.sycl rename to docker/Dockerfile.sycl diff --git a/Dockerfile.vulkan b/docker/Dockerfile.vulkan similarity index 100% rename from Dockerfile.vulkan rename to docker/Dockerfile.vulkan diff --git a/docs/docker.md b/docs/docker.md index 660ed2577..5bacdd2d4 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -19,7 +19,7 @@ docker run --rm --init -v /path/to/models:/models -v /path/to/output/:/output -p ## Building using Docker ```shell -docker build -t sd . +docker build -f docker/Dockerfile -t sd . ``` ## Building variants using Docker @@ -27,7 +27,7 @@ docker build -t sd . Vulkan: ```shell -docker build -f Dockerfile.vulkan -t sd . +docker build -f docker/Dockerfile.vulkan -t sd . ``` ## Run locally built image's CLI