From 40fd30092dc8db7d10aca4ff0758d6e020b5ba97 Mon Sep 17 00:00:00 2001
From: AJ Walter <git@awalter.net>
Date: Sat, 15 Apr 2023 14:59:17 -0500
Subject: [PATCH] Move label to x-gpu-config, add "x", use git image

---
 docker-compose.yml                | 23 ++++++++++++++---------
 services/AUTOMATIC1111/Dockerfile |  6 ++----
 services/AUTOMATIC1111/clone.sh   |  6 +++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0e24ef9..1f88163 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,6 @@ x-base_service: &base_service
       - &v1 ./data:/data
       - &v2 ./output:/output
     stop_signal: SIGINT
-    security_opt:
-      - label=type:nvidia_container_t
-    runtime: nvidia
     deploy:
       resources:
         reservations:
@@ -18,6 +15,11 @@ x-base_service: &base_service
                 device_ids: ['0']
                 capabilities: [gpu]
 
+x-gpu-config: &gpu_config
+    security_opt:
+      - label=type:nvidia_container_t
+    runtime: nvidia
+
 name: webui-docker
 
 services:
@@ -27,23 +29,25 @@ services:
     volumes:
       - *v1
 
-  auto: &automatic
+  auto-cpu: &automatic
     <<: *base_service
-    profiles: ["auto"]
+    profiles: ["auto-cpu"]
     build: ./services/AUTOMATIC1111
     image: sd-auto:51
     environment:
-      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
+      - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api
 
-  auto-cpu:
+  auto:
     <<: *automatic
-    profiles: ["auto-cpu"]
+    <<: *gpu_config
+    profiles: ["auto"]
     deploy: {}
     environment:
-      - CLI_ARGS=--no-half --precision full --allow-code --enable-insecure-extension-access --api
+      - CLI_ARGS=--allow-code --medvram --xformers --enable-insecure-extension-access --api
 
   invoke:
     <<: *base_service
+    <<: *gpu_config
     profiles: ["invoke"]
     build: ./services/invoke/
     image: sd-invoke:26
@@ -54,6 +58,7 @@ services:
 
   sygil: &sygil
     <<: *base_service
+    <<: *gpu_config
     profiles: ["sygil"]
     build: ./services/sygil/
     image: sd-sygil:16
diff --git a/services/AUTOMATIC1111/Dockerfile b/services/AUTOMATIC1111/Dockerfile
index 5530715..c39882e 100644
--- a/services/AUTOMATIC1111/Dockerfile
+++ b/services/AUTOMATIC1111/Dockerfile
@@ -1,8 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM alpine:3.17 as download
-
-RUN apk add git
+FROM alpine/git:2.36.2 as download
 
 COPY clone.sh /clone.sh
 
@@ -46,7 +44,7 @@ RUN --mount=type=cache,target=/root/.cache/pip  \
 ENV ROOT=/stable-diffusion-webui
 
 
-COPY --from=download /git/ ${ROOT}
+COPY --from=download /repositories/ ${ROOT}/repositories/
 RUN mkdir ${ROOT}/interrogate && cp ${ROOT}/repositories/clip-interrogator/data/* ${ROOT}/interrogate
 RUN --mount=type=cache,target=/root/.cache/pip \
   pip install -r ${ROOT}/repositories/CodeFormer/requirements.txt
diff --git a/services/AUTOMATIC1111/clone.sh b/services/AUTOMATIC1111/clone.sh
index a917077..cfdf0a2 100644
--- a/services/AUTOMATIC1111/clone.sh
+++ b/services/AUTOMATIC1111/clone.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-set -Eeuo pipefail
+set -Eeuox pipefail
 
-mkdir -p git/repositories/"$1"
-cd git/repositories/"$1"
+mkdir -p /repositories/"$1"
+cd /repositories/"$1"
 git init
 git remote add origin "$2"
 git fetch origin "$3" --depth=1