From eb809cded23a1dfa06282f58674bc155982bb705 Mon Sep 17 00:00:00 2001
From: Abdullah Barhoum <ka70911@gmail.com>
Date: Sun, 11 Sep 2022 08:29:58 +0200
Subject: [PATCH] Remove dead config

---
 .github/workflows/docker.yml              |  5 +++--
 docker-compose.yml                        | 13 +++++++++----
 services/AUTOMATIC1111/config.json        |  2 +-
 services/AUTOMATIC1111/docker-compose.yml | 21 ---------------------
 services/lstein/docker-compose.yml        | 20 --------------------
 5 files changed, 13 insertions(+), 48 deletions(-)
 delete mode 100644 services/AUTOMATIC1111/docker-compose.yml
 delete mode 100644 services/lstein/docker-compose.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 94b109b..d976322 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,13 +1,14 @@
-name: Build Image
+name: Build Images
 
 on: [push]
 
 jobs:
   build_all:
     runs-on: ubuntu-latest
+    name: All
     steps:
       - uses: actions/checkout@v3
       # better caching?
+      - run: docker compose --profile auto build --progress plain
       - run: docker compose --profile hlky build --progress plain
-      - run: docker compose --profile auto  build --progress plain
       - run: docker compose --profile lstein build --progress plain
diff --git a/docker-compose.yml b/docker-compose.yml
index dcc627f..a9db4d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,10 @@ version: '3.9'
 x-base_service: &base_service
     ports:
       - "7860:7860"
-    volumes: &base_volumes
-      - ./cache:/cache
-      - ./output:/output
-      - ./models:/models
+    volumes:
+      - &v1 ./cache:/cache
+      - &v2 ./output:/output
+      - &v3 ./models:/models
     deploy:
       resources:
         reservations:
@@ -29,6 +29,11 @@ services:
     <<: *base_service
     profiles: ["auto"]
     build: ./services/AUTOMATIC1111
+    volumes:
+      - *v1
+      - *v2
+      - *v3
+      - ./services/AUTOMATIC1111/config.json:/docker/config.json
     environment:
       - CLI_ARGS=--medvram --opt-split-attention
 
diff --git a/services/AUTOMATIC1111/config.json b/services/AUTOMATIC1111/config.json
index 330ab03..e16f2c6 100644
--- a/services/AUTOMATIC1111/config.json
+++ b/services/AUTOMATIC1111/config.json
@@ -1 +1 @@
-{"outdir_samples": "/output", "outdir_txt2img_samples": "/output/txt2img-images", "outdir_img2img_samples": "/output/img2img-images", "outdir_extras_samples": "/output/extras-images", "outdir_txt2img_grids": "/output/txt2img-grids", "outdir_img2img_grids": "/output/img2img-grids", "outdir_save": "/output/saved", "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS", "outdir_grids": "", "save_to_dirs": false, "save_to_dirs_prompt_len": 10, "samples_save": true, "samples_format": "png", "grid_save": true, "return_grid": true, "grid_format": "png", "grid_extended_filename": false, "grid_only_if_multiple": true, "n_rows": -1, "jpeg_quality": 80, "export_for_4chan": true, "enable_pnginfo": true, "font": "DejaVuSans.ttf", "enable_emphasis": true, "save_txt": false, "ESRGAN_tile": 192, "ESRGAN_tile_overlap": 8, "random_artist_categories": [], "upscale_at_full_resolution_padding": 16, "show_progressbar": true, "show_progress_every_n_steps": 0, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5}
\ No newline at end of file
+{"outdir_samples": "/output", "outdir_txt2img_samples": "/output/txt2img-images", "outdir_img2img_samples": "/output/img2img-images", "outdir_extras_samples": "/output/extras-images", "outdir_txt2img_grids": "/output/txt2img-grids", "outdir_img2img_grids": "/output/img2img-grids", "outdir_save": "/output/saved", "__WARNING__": "DON'T CHANGE ANYTHING BEFORE THIS", "outdir_grids": "", "save_to_dirs": false, "save_to_dirs_prompt_len": 10, "samples_save": true, "samples_format": "png", "grid_save": true, "return_grid": true, "grid_format": "png", "grid_extended_filename": false, "grid_only_if_multiple": true, "n_rows": -1, "jpeg_quality": 80, "export_for_4chan": true, "enable_pnginfo": true, "font": "DejaVuSans.ttf", "enable_emphasis": true, "save_txt": false, "ESRGAN_tile": 192, "ESRGAN_tile_overlap": 8, "random_artist_categories": [], "upscale_at_full_resolution_padding": 16, "show_progressbar": true, "show_progress_every_n_steps": 5, "multiple_tqdm": true, "face_restoration_model": "CodeFormer", "code_former_weight": 0.5, "grid_save_to_dirs": false}
\ No newline at end of file
diff --git a/services/AUTOMATIC1111/docker-compose.yml b/services/AUTOMATIC1111/docker-compose.yml
deleted file mode 100644
index 223ca19..0000000
--- a/services/AUTOMATIC1111/docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: '3.9'
-
-services:
-  model:
-    build: .
-    ports:
-      - "7860:7860"
-    volumes:
-      - ../cache:/cache
-      - ../output:/output
-      - ../models:/models
-      - ./config.json:/docker/config.json
-    environment:
-      - CLI_ARGS=--medvram --opt-split-attention
-    deploy:
-      resources:
-        reservations:
-          devices:
-              - driver: nvidia
-                device_ids: ['0']
-                capabilities: [gpu]
diff --git a/services/lstein/docker-compose.yml b/services/lstein/docker-compose.yml
deleted file mode 100644
index 20adc83..0000000
--- a/services/lstein/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '3.9'
-
-services:
-  model:
-    build: .
-    ports:
-      - "7860:7860"
-    volumes:
-      - ../cache:/cache
-      - ../output:/output
-      - ../models:/models
-    environment:
-      - CLI_ARGS=
-    deploy:
-      resources:
-        reservations:
-          devices:
-              - driver: nvidia
-                device_ids: ['0']
-                capabilities: [gpu]