From 082876aab38dceb9c523e3f5315b9649edb86102 Mon Sep 17 00:00:00 2001 From: AbdBarho Date: Sun, 4 Sep 2022 09:12:07 +0200 Subject: [PATCH] SHA as Build ARG (#30) --- README.md | 5 ++--- build/Dockerfile | 3 ++- docker-compose.yml | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9da3773..f0ef149 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,11 @@ Note: the first start will take sometime as some other models will be downloaded You can find fixes to common issues [in the wiki page.](https://github.com/AbdBarho/stable-diffusion-webui-docker/wiki/FAQ) - ## Config -in the `docker-compose.yml` you can change the `CLI_ARGS` variable, which contains the arguments that will be passed to the WebUI. By default: `--extra-models-cpu --optimized-turbo` are given, which allow you to use this model on a 6GB GPU. However, some features might not be available in the mode. +in the `docker-compose.yml` you can change the `CLI_ARGS` variable, which contains the arguments that will be passed to the WebUI. By default: `--extra-models-cpu --optimized-turbo` are given, which allow you to use this model on a 6GB GPU. However, some features might not be available in the mode. [You can find the full list of arguments here.](https://github.com/hlky/stable-diffusion/blob/bb765f1897c968495ffe12a06b421d97b56d5ae1/scripts/webui.py) -[You can find the full list of arguments here.](https://github.com/hlky/stable-diffusion/blob/d667ff52a36b4e79526f01555bfbf85428f334ce/scripts/webui.py) +You can set the `WEBUI_SHA` to [any SHA from the main repo](https://github.com/hlky/stable-diffusion/commits/main), this will build the container against that commit. Use at your own risk. # Disclaimer diff --git a/build/Dockerfile b/build/Dockerfile index 09778ed..6dcb510 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -23,7 +23,8 @@ RUN pip install -U --no-cache-dir pyperclip # Note: don't update the sha of previous versions because the install will take forever # instead, update the repo state in a later step -RUN cd stable-diffusion && git pull && git reset --hard bb765f1897c968495ffe12a06b421d97b56d5ae1 && \ +ARG WEBUI_SHA=bb765f1897c968495ffe12a06b421d97b56d5ae1 +RUN cd stable-diffusion && git pull && git reset --hard ${WEBUI_SHA} && \ conda env update --file environment.yaml --name base && conda clean -a -y diff --git a/docker-compose.yml b/docker-compose.yml index 82304a7..2563f30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,12 @@ version: '3.9' services: model: - build: ./build/ + build: + context: ./build/ + args: + # You can choose any commit sha from https://github.com/hlky/stable-diffusion/commits/main + # USE AT YOUR OWN RISK! otherwise just leave it empty. + WEBUI_SHA: restart: on-failure ports: - "7860:7860"