diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42d549c7ff546478b9dcce07d4603f330cd847bd..756d5c994513e83bf4a242566e541c221f1a282a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ --- ### SET IN CI VARIABLES # variables: -# VERSION: "1.6.0" +# VERSION: "1.6.1" # IMAGE_NAME: "registry.example.com/stable-diffusion-webui" stages: @@ -11,7 +11,7 @@ stages: build_image: stage: build script: - - docker build --progress plain --build-arg VERSION=${VERSION} -t ${IMAGE_NAME}:${VERSION} . + - docker build --progress plain --build-arg="VERSION=${VERSION}" -t ${IMAGE_NAME}:${VERSION} . push_image: stage: push diff --git a/Dockerfile b/Dockerfile index 374e00bc9823ad068df9ccdfb60a2153290b0c3a..fde14252671f25cf3c199b705a2582e56839b50a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM nvidia/cuda:12.2.0-base-ubuntu22.04 +FROM nvidia/cuda:12.3.0-runtime-ubuntu22.04 +ENV VERSION=v1.6.1 ARG VERSION -ENV VERSION=1.6.0 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update -y \ @@ -9,7 +9,7 @@ RUN apt-get -qq update -y \ git git-lfs libgl1 pkg-config python-is-python3 python3-dev python3-pip \ && rm -rf /var/lib/apt/lists/* -RUN git clone --depth 1 --branch v${VERSION} -c advice.detachedHead=false \ +RUN git clone --branch ${VERSION} --single-branch --depth 1 -c advice.detachedHead=false \ https://github.com/AUTOMATIC1111/stable-diffusion-webui.git /app WORKDIR /app @@ -20,6 +20,10 @@ RUN sed -i -e 's/ start()/ #start()/g' /app/launch.py \ && python launch.py --skip-torch-cuda-test \ && sed -i -e 's/ #start()/ start()/g' /app/launch.py +ADD requirements_*.txt /tmp/ +RUN pip install --extra-index-url https://pypi.nvidia.com -r /tmp/requirements_add.txt \ + && pip uninstall -r /tmp/requirements_remove.txt -y + EXPOSE 7860 ENTRYPOINT ["python", "launch.py", "--listen", "--data-dir", "/app/data", "--disable-console-progressbars", "--enable-insecure-extension-access"] diff --git a/README.md b/README.md index d2d72a90dc20c6d1775a83eb4dc9ec32e3cc6b9c..2f839cea87ca70934e43b40c0de20e87a8967bc7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This builds a Docker image containing the Stable Diffusion WebUI by AUTOMATIC111 ## Build the image (and optionally push it to your registry) Set the version and image name to use: ``` -export VERSION="1.x.y" +export VERSION="v1.x.y" export IMAGE_NAME=registry.example.com/stable-diffusion-webui ``` Build the image and also add the `latest` tag: diff --git a/requirements_add.txt b/requirements_add.txt new file mode 100644 index 0000000000000000000000000000000000000000..589e61bd35269f037e24808fa04073d94590a023 --- /dev/null +++ b/requirements_add.txt @@ -0,0 +1,9 @@ +nvidia-cudnn-cu11==8.9.4.25 +tensorrt==9.0.1.post11.dev4 +tensorrt-libs==9.0.1.post11.dev4 +tensorrt-bindings==9.0.1.post11.dev4 +protobuf==3.20.2 +polygraphy==0.49.0 +onnx-graphsurgeon==0.3.25 +onnxruntime==1.16.3 +colored==2.2.3 diff --git a/requirements_remove.txt b/requirements_remove.txt new file mode 100644 index 0000000000000000000000000000000000000000..12a5ce911a3803d579bb9bd4f3ed98ddac588d15 --- /dev/null +++ b/requirements_remove.txt @@ -0,0 +1 @@ +nvidia-cudnn-cu11==8.9.4.25