(docker) add patchmatch to the cloud image; improve build caching; simplify Makefile

Author: ebr

.dockerignore

@@ -9,6 +9,7 @@
 !static
 !setup.py
 !docker-build
+!docs
 docker-build/Dockerfile
 
 # Guard against pulling in any models that might exist in the directory tree

docker-build/Dockerfile.cloud

@@ -1,59 +1,85 @@
+#######################
 #### Builder stage ####
 
 FROM library/ubuntu:22.04 AS builder
 
-ENV DEBIAN_FRONTEND=noninteractive
-ENV PYTHONDONTWRITEBYTECODE=1
-# unbuffered output, ensures stdout and stderr are printed in the correct order
-ENV PYTHONUNBUFFERED=1
-
-RUN --mount=type=cache,target=/var/cache/apt \
-    apt update && apt install -y \
-    libglib2.0-0 \
-    libgl1-mesa-glx \
-    python3-venv \
-    python3-pip
+ARG DEBIAN_FRONTEND=noninteractive
+RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt update && apt-get install -y \
+        git \
+        libglib2.0-0 \
+        libgl1-mesa-glx \
+        python3-venv \
+        python3-pip \
+        build-essential \
+        python3-opencv \
+        libopencv-dev
 
+# This is needed for patchmatch support
+RUN cd /usr/lib/x86_64-linux-gnu/pkgconfig/ &&\
+   ln -sf opencv4.pc opencv.pc
 
-ARG APP_ROOT=/invokeai
-WORKDIR ${APP_ROOT}
+ARG WORKDIR=/invokeai
+WORKDIR ${WORKDIR}
 
-ENV VIRTUAL_ENV=${APP_ROOT}/.venv
+ENV VIRTUAL_ENV=${WORKDIR}/.venv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-COPY . .
 RUN --mount=type=cache,target=/root/.cache/pip \
-    cp installer/py3.10-linux-x86_64-cuda-reqs.txt requirements.txt && \
     python3 -m venv ${VIRTUAL_ENV} &&\
     pip install --extra-index-url https://download.pytorch.org/whl/cu116 \
         torch==1.12.0+cu116 \
         torchvision==0.13.0+cu116 &&\
+    pip install -e git+https://github.com/invoke-ai/PyPatchMatch@0.1.3#egg=pypatchmatch
+
+COPY . .
+RUN --mount=type=cache,target=/root/.cache/pip \
+    cp installer/py3.10-linux-x86_64-cuda-reqs.txt requirements.txt && \
     pip install -r requirements.txt &&\
     pip install -e .
 
 
+#######################
 #### Runtime stage ####
 
-FROM ubuntu:22.04 as runtime
-RUN apt update && apt install -y \
-    git \
-    curl \
-    ncdu \
-    iotop \
-    bzip2 \
-    libglib2.0-0 \
-    libgl1-mesa-glx \
-    python3-venv \
-    python3-pip \
-    && apt-get clean
-
-ARG APP_ROOT=/invokeai
-WORKDIR ${APP_ROOT}
-
-ENV VIRTUAL_ENV=${APP_ROOT}/.venv
+FROM library/ubuntu:22.04 as runtime
+
+ARG DEBIAN_FRONTEND=noninteractive
+ENV PYTHONUNBUFFERED=1
+RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
+    --mount=type=cache,target=/var/lib/apt,sharing=locked \
+    apt update && apt install -y --no-install-recommends \
+        git \
+        curl \
+        ncdu \
+        iotop \
+        bzip2 \
+        libglib2.0-0 \
+        libgl1-mesa-glx \
+        python3-venv \
+        python3-pip \
+        build-essential \
+        python3-opencv \
+        libopencv-dev &&\
+    apt-get clean && apt-get autoclean
+
+ARG WORKDIR=/invokeai
+WORKDIR ${WORKDIR}
+
+ENV INVOKEAI_ROOT=/mnt/invokeai
+ENV VIRTUAL_ENV=${WORKDIR}/.venv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
-COPY --from=builder ${APP_ROOT} ${APP_ROOT}
+COPY --from=builder ${WORKDIR} ${WORKDIR}
+COPY --from=builder /usr/lib/x86_64-linux-gnu/pkgconfig /usr/lib/x86_64-linux-gnu/pkgconfig
+
+# build patchmatch
+RUN python -c "from patchmatch import patch_match"
+
+## workaround for non-existent initfile when runtime directory is mounted; see #1613
+RUN touch /root/.invokeai
 
 ENTRYPOINT ["bash"]
 

docker-build/Makefile

@@ -3,7 +3,6 @@ INVOKEAI_ROOT=/mnt/invokeai
 # Host directory to contain the runtime dir. Will be mounted at INVOKEAI_ROOT path in the container
 HOST_MOUNT_PATH=${HOME}/invokeai
 
-DOCKER_BUILDKIT=1
 IMAGE=local/invokeai:latest
 
 USER=$(shell id -u)
@@ -14,41 +13,32 @@ GROUP=$(shell id -g)
 # Contents can be moved to a persistent storage and used to prime the cache on another host.
 
 build:
-	docker build -t local/invokeai:latest -f Dockerfile.cloud ..
+	DOCKER_BUILDKIT=1 docker build -t local/invokeai:latest -f Dockerfile.cloud ..
 
 configure:
 	docker run --rm -it --runtime=nvidia --gpus=all \
 		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-v ${HOST_MOUNT_PATH}/.cache:/root/.cache \
 		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		--entrypoint bash \
-		${IMAGE} -c "scripts/configure_invokeai.py"
-	sudo chown -R ${USER}:${GROUP} ${HOST_MOUNT_PATH}
+		${IMAGE} -c "python scripts/configure_invokeai.py"
 
 # Run the container with the runtime dir mounted and the web server exposed on port 9090
 web:
 	docker run --rm -it --runtime=nvidia --gpus=all \
 		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-v ${HOST_MOUNT_PATH}/.cache:/root/.cache \
 		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		--entrypoint bash -p9090:9090 ${IMAGE} \
-		-c "scripts/invoke.py --web --host 0.0.0.0 --root ${INVOKEAI_ROOT}"
+		-p 9090:9090 \
+		${IMAGE} -c "python scripts/invoke.py --web --host 0.0.0.0"
 
 # Run the cli with the runtime dir mounted
 cli:
 	docker run --rm -it --runtime=nvidia --gpus=all \
 		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-v ${HOST_MOUNT_PATH}/.cache:/root/.cache \
 		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		--entrypoint bash ${IMAGE} \
-		-c "scripts/invoke.py --root ${INVOKEAI_ROOT}"
+		${IMAGE} -c "python scripts/invoke.py"
 
-# Run the container with the cache mounted and open a bash shell instead of the Invoke CLI or webserver
+# Run the container with the runtime dir mounted and open a bash shell
 shell:
 	docker run --rm -it --runtime=nvidia --gpus=all \
-		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} \
-		-v ${HOST_MOUNT_PATH}/.cache:/root/.cache \
-		-e INVOKEAI_ROOT=${INVOKEAI_ROOT} \
-		--entrypoint bash ${IMAGE} --
+		-v ${HOST_MOUNT_PATH}:${INVOKEAI_ROOT} ${IMAGE} --
 
 .PHONY: build configure web cli shell