From a01a1510027fd2050d665ad7b9f8b8cf7f4abb2d Mon Sep 17 00:00:00 2001
From: LEv145 <40071054+LEv145@users.noreply.github.com>
Date: Mon, 27 Mar 2023 08:59:05 +0200
Subject: [PATCH 1/7] Add cpu support and profiles

---
 docker-compose.yml | 56 ++++++++++++++++++++++++++++------------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 41fb6604b..79351e8b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,25 +1,37 @@
 version: "3.9"
 
+
+x-base_service: &base_service
+  image: comfyui:1
+  build: .
+
+  environment:
+    - CLI_ARGS=--listen --port 8188
+
+  ports:
+    - "8188:8188"
+  volumes:
+    - ./models:/opt/comfy_ui/models
+    - ./output:/opt/comfy_ui/output
+    - ./input:/opt/comfy_ui/input
+    - ./custom_nodes:/opt/comfy_ui/custom_nodes
+  
+x-nvidia_docker: &nvidia_docker
+  deploy:
+    resources:
+      reservations:
+        devices:
+          - driver: nvidia
+            device_ids: ["0"]
+            capabilities: [gpu]
+
+
 services:
-  app:
-    image: comfyui:1
-    build: .
-
-    ports:
-      - "8188:8188"
-    volumes:
-      - ./models:/opt/comfy_ui/models
-      - ./output:/opt/comfy_ui/output
-      - ./input:/opt/comfy_ui/input
-      - ./custom_nodes:/opt/comfy_ui/custom_nodes      
-
-    environment:
-      - CLI_ARGS=--listen --port 8188
-
-    deploy:
-      resources:
-        reservations:
-          devices:
-              - driver: nvidia
-                device_ids: ["0"]
-                capabilities: [gpu]
+  nvidia:
+    <<: *base_service
+    <<: *nvidia_docker
+    profiles: ["nvidia"]
+    
+  cpu:
+    <<: *base_service
+    profiles: ["cpu"]

From 55846608bbf1c844c40c3dda23ece1c97aec5fa6 Mon Sep 17 00:00:00 2001
From: LEv145 <40071054+LEv145@users.noreply.github.com>
Date: Mon, 27 Mar 2023 09:43:11 +0200
Subject: [PATCH 2/7] Add amd gpu support

Testing
---
 docker-compose.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 79351e8b5..90a8b2ce6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ x-base_service: &base_service
     - ./output:/opt/comfy_ui/output
     - ./input:/opt/comfy_ui/input
     - ./custom_nodes:/opt/comfy_ui/custom_nodes
-  
+
 x-nvidia_docker: &nvidia_docker
   deploy:
     resources:
@@ -25,13 +25,25 @@ x-nvidia_docker: &nvidia_docker
             device_ids: ["0"]
             capabilities: [gpu]
 
+x-base_service_amd: &amd_docker
+  group_add:
+    - video
+  devices:
+    - "/dev/dri"
+    - "/dev/kfd"
+
 
 services:
   nvidia:
     <<: *base_service
     <<: *nvidia_docker
     profiles: ["nvidia"]
-    
+
+  amd:
+    <<: *base_service
+    <<: *amd_docker
+    profiles: ["amd"]
+
   cpu:
     <<: *base_service
     profiles: ["cpu"]

From 693da6d075a0179b483f5ce4853b5bd7010aedb0 Mon Sep 17 00:00:00 2001
From: LEv145 <40071054+LEv145@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:03:30 +0200
Subject: [PATCH 3/7] Add amd6600 support

---
 docker-compose.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 90a8b2ce6..e0a8c2d45 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,6 +43,19 @@ services:
     <<: *base_service
     <<: *amd_docker
     profiles: ["amd"]
+    
+  amd6600:
+    <<: *base_service
+    <<: *amd_docker
+    profiles: ["amd6600"]
+  
+    environment:
+      - HSA_OVERRIDE_GFX_VERSION=10.3.0
+
+  cpu:
+    <<: *base_service
+    profiles: ["cpu"]
+
 
   cpu:
     <<: *base_service

From 72597baf93ef57466c84008eea91d53b4e93f9ab Mon Sep 17 00:00:00 2001
From: LEv145 <40071054+LEv145@users.noreply.github.com>
Date: Mon, 27 Mar 2023 10:13:38 +0200
Subject: [PATCH 4/7] Fix environments

---
 docker-compose.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e0a8c2d45..42cc4f1a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,12 +51,10 @@ services:
   
     environment:
       - HSA_OVERRIDE_GFX_VERSION=10.3.0
+      - CLI_ARGS=--listen --port 8188
 
   cpu:
     <<: *base_service
     profiles: ["cpu"]
-
-
-  cpu:
-    <<: *base_service
-    profiles: ["cpu"]
+    environment:
+      - CLI_ARGS=--listen --port 8188 --cpu

From 26ef6d906193f8a54b8fc98e600252ba0762e513 Mon Sep 17 00:00:00 2001
From: LEv145 <you@example.com>
Date: Mon, 27 Mar 2023 16:39:58 +0200
Subject: [PATCH 5/7] Update docker

Add path for docker
Add Dockerfile for AMD
---
 .../docker-compose.yml                        | 28 ++++++++++++++-----
 docker/docker_files/amd.Dockerfile            | 17 +++++++++++
 .../docker_files/default.Dockerfile           |  2 +-
 3 files changed, 39 insertions(+), 8 deletions(-)
 rename docker-compose.yml => docker/docker-compose.yml (70%)
 create mode 100644 docker/docker_files/amd.Dockerfile
 rename Dockerfile => docker/docker_files/default.Dockerfile (92%)

diff --git a/docker-compose.yml b/docker/docker-compose.yml
similarity index 70%
rename from docker-compose.yml
rename to docker/docker-compose.yml
index 42cc4f1a4..170838ad0 100644
--- a/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,7 +3,9 @@ version: "3.9"
 
 x-base_service: &base_service
   image: comfyui:1
-  build: .
+  build:
+    context: docker_files
+    dockerfile: default.Dockerfile
 
   environment:
     - CLI_ARGS=--listen --port 8188
@@ -11,10 +13,11 @@ x-base_service: &base_service
   ports:
     - "8188:8188"
   volumes:
-    - ./models:/opt/comfy_ui/models
-    - ./output:/opt/comfy_ui/output
-    - ./input:/opt/comfy_ui/input
-    - ./custom_nodes:/opt/comfy_ui/custom_nodes
+    - models:/opt/comfy_ui/models
+    - output:/opt/comfy_ui/output
+    - input:/opt/comfy_ui/input
+    - custom_nodes:/opt/comfy_ui/custom_nodes
+  restart: unless-stopped
 
 x-nvidia_docker: &nvidia_docker
   deploy:
@@ -26,6 +29,10 @@ x-nvidia_docker: &nvidia_docker
             capabilities: [gpu]
 
 x-base_service_amd: &amd_docker
+  build:
+    context: docker_files
+    dockerfile: amd.Dockerfile
+
   group_add:
     - video
   devices:
@@ -43,12 +50,12 @@ services:
     <<: *base_service
     <<: *amd_docker
     profiles: ["amd"]
-    
+
   amd6600:
     <<: *base_service
     <<: *amd_docker
     profiles: ["amd6600"]
-  
+
     environment:
       - HSA_OVERRIDE_GFX_VERSION=10.3.0
       - CLI_ARGS=--listen --port 8188
@@ -58,3 +65,10 @@ services:
     profiles: ["cpu"]
     environment:
       - CLI_ARGS=--listen --port 8188 --cpu
+
+
+volumes:
+  models:
+  output:
+  input:
+  custom_nodes:
diff --git a/docker/docker_files/amd.Dockerfile b/docker/docker_files/amd.Dockerfile
new file mode 100644
index 000000000..82b8ac543
--- /dev/null
+++ b/docker/docker_files/amd.Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.10-slim
+
+
+WORKDIR /opt/comfy_ui
+
+
+RUN PIP_NO_CACHE_DIR=1 pip install --extra-index-url https://download.pytorch.org/whl/rocm5.4.2 \
+torch \
+torchvision \
+torchaudio
+
+COPY ../.. /opt/comfy_ui
+RUN pip install -r requirements.txt
+
+
+ENV CLI_ARGS=""
+CMD python main.py ${CLI_ARGS}
diff --git a/Dockerfile b/docker/docker_files/default.Dockerfile
similarity index 92%
rename from Dockerfile
rename to docker/docker_files/default.Dockerfile
index 03dd3a855..c9228b15d 100644
--- a/Dockerfile
+++ b/docker/docker_files/default.Dockerfile
@@ -11,7 +11,7 @@ torchaudio \
 xformers \
 triton
 
-COPY . /opt/comfy_ui
+COPY ../.. /opt/comfy_ui
 RUN pip install -r requirements.txt
 
 

From eab3e044199e4dc54d37e57d17934873ae493363 Mon Sep 17 00:00:00 2001
From: LEv145 <you@example.com>
Date: Mon, 27 Mar 2023 17:36:16 +0200
Subject: [PATCH 6/7] Fix docker context paths

---
 docker/docker-compose.yml              | 8 ++++----
 docker/docker_files/amd.Dockerfile     | 2 +-
 docker/docker_files/default.Dockerfile | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 170838ad0..44462714b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -4,8 +4,8 @@ version: "3.9"
 x-base_service: &base_service
   image: comfyui:1
   build:
-    context: docker_files
-    dockerfile: default.Dockerfile
+    context: ..
+    dockerfile: docker/docker_files/default.Dockerfile
 
   environment:
     - CLI_ARGS=--listen --port 8188
@@ -30,8 +30,8 @@ x-nvidia_docker: &nvidia_docker
 
 x-base_service_amd: &amd_docker
   build:
-    context: docker_files
-    dockerfile: amd.Dockerfile
+    context: ..
+    dockerfile: docker/docker_files/amd.Dockerfile
 
   group_add:
     - video
diff --git a/docker/docker_files/amd.Dockerfile b/docker/docker_files/amd.Dockerfile
index 82b8ac543..e5392c037 100644
--- a/docker/docker_files/amd.Dockerfile
+++ b/docker/docker_files/amd.Dockerfile
@@ -9,7 +9,7 @@ torch \
 torchvision \
 torchaudio
 
-COPY ../.. /opt/comfy_ui
+COPY . /opt/comfy_ui
 RUN pip install -r requirements.txt
 
 
diff --git a/docker/docker_files/default.Dockerfile b/docker/docker_files/default.Dockerfile
index c9228b15d..03dd3a855 100644
--- a/docker/docker_files/default.Dockerfile
+++ b/docker/docker_files/default.Dockerfile
@@ -11,7 +11,7 @@ torchaudio \
 xformers \
 triton
 
-COPY ../.. /opt/comfy_ui
+COPY . /opt/comfy_ui
 RUN pip install -r requirements.txt
 
 

From 151cb8da24326dba3328af3a955b851238dc8963 Mon Sep 17 00:00:00 2001
From: LEv145 <you@example.com>
Date: Mon, 27 Mar 2023 17:41:34 +0200
Subject: [PATCH 7/7] Add name for `docker-compose`

---
 docker/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 44462714b..3b627230b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,4 +1,5 @@
 version: "3.9"
+name: "comfyui"
 
 
 x-base_service: &base_service