Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

add flavor to pip cache id

Browse Source 
to prevent cache invalidation
This commit is contained in:
mauwii 2023-02-06 23:46:53 +01:00 committed by Matthias Wild
parent 28a5424242
commit cdb3e18b80
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build-container.yml vendored
View File

@ -3,7 +3,8 @@ on:
push: push:
branches: branches:
- 'main' - 'main'
- 'update/ci/*' - 'update/ci/docker/*'
- 'update/docker/*'
tags: tags:
- 'v*.*.*' - 'v*.*.*'

33
docker/Dockerfile
View File

@ -1,4 +1,5 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG PYTHON_VERSION=3.9 ARG PYTHON_VERSION=3.9
################## ##################
## base image ## ## base image ##
@ -6,19 +7,19 @@ ARG PYTHON_VERSION=3.9
FROM python:${PYTHON_VERSION}-slim AS python-base FROM python:${PYTHON_VERSION}-slim AS python-base
# prepare for buildkit cache # prepare for buildkit cache
RUN rm -f /etc/apt/apt.conf.d/docker-clean 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
# Install necesarry packages # Install necesarry packages
RUN \ RUN \
--mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/cache/apt,sharing=locked \
apt-get update \ --mount=type=cache,target=/var/lib/apt,sharing=locked \
&& apt-get install \ apt update \
-yqq \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
libgl1-mesa-glx=20.3.* \ libgl1-mesa-glx=20.3.* \
libglib2.0-0=2.66.* \ libglib2.0-0=2.66.* \
libopencv-dev=4.5.* \ libopencv-dev=4.5.*
&& rm -rf /var/lib/apt/lists/*
# set working directory and path # set working directory and path
ARG APPDIR=/usr/src ARG APPDIR=/usr/src
@ -34,24 +35,24 @@ ENV PIP_USE_PEP517=1
# prepare for buildkit cache # prepare for buildkit cache
ARG PIP_CACHE_DIR=/var/cache/buildkit/pip ARG PIP_CACHE_DIR=/var/cache/buildkit/pip
ARG CONTAINER_FLAVOR=cuda
ENV PIP_CACHE_DIR ${PIP_CACHE_DIR} ENV PIP_CACHE_DIR ${PIP_CACHE_DIR}
RUN mkdir -p ${PIP_CACHE_DIR} RUN mkdir -p ${PIP_CACHE_DIR}
# Install dependencies # Install dependencies
RUN \ RUN \
--mount=type=cache,target=${PIP_CACHE_DIR} \ --mount=type=cache,target=${PIP_CACHE_DIR},id=pip-${CONTAINER_FLAVOR} \
--mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/cache/apt,sharing=locked \
apt-get update \ --mount=type=cache,target=/var/lib/apt,sharing=locked \
&& apt-get install \ apt update \
-yqq \ && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
build-essential=12.9 \ build-essential=12.9 \
gcc=4:10.2.* \ gcc=4:10.2.* \
python3-dev=3.9.* \ python3-dev=3.9.*
&& rm -rf /var/lib/apt/lists/*
# create virtual environment # create virtual environment
RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ RUN --mount=type=cache,target=${PIP_CACHE_DIR},id=pip-${CONTAINER_FLAVOR} \
python3 -m venv "${APPNAME}" \ python3 -m venv "${APPNAME}" \
--upgrade-deps --upgrade-deps
@ -62,8 +63,8 @@ COPY --link . .
ARG PIP_EXTRA_INDEX_URL ARG PIP_EXTRA_INDEX_URL
ENV PIP_EXTRA_INDEX_URL ${PIP_EXTRA_INDEX_URL} ENV PIP_EXTRA_INDEX_URL ${PIP_EXTRA_INDEX_URL}
ARG PIP_PACKAGE=. ARG PIP_PACKAGE=.
RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ RUN --mount=type=cache,target=${PIP_CACHE_DIR},id=pip-${CONTAINER_FLAVOR} \
"${APPDIR}/${APPNAME}/bin/pip" install ${PIP_PACKAGE} "${APPNAME}/bin/pip" install ${PIP_PACKAGE}
# build patchmatch # build patchmatch
RUN python3 -c "from patchmatch import patch_match" RUN python3 -c "from patchmatch import patch_match"
@ -74,7 +75,7 @@ RUN python3 -c "from patchmatch import patch_match"
FROM python-base AS runtime FROM python-base AS runtime
# setup environment # setup environment
COPY --from=pyproject-builder --link ${APPDIR}/${APPNAME} ${APPDIR}/${APPNAME} COPY --from=pyproject-builder ${APPDIR}/${APPNAME} ${APPDIR}/${APPNAME}
ENV INVOKEAI_ROOT=/data ENV INVOKEAI_ROOT=/data
ENV INVOKE_MODEL_RECONFIGURE="--yes --default_only" ENV INVOKE_MODEL_RECONFIGURE="--yes --default_only"

7
docker/build.sh
View File

@ -36,9 +36,10 @@ fi
# Build Container # Build Container
DOCKER_BUILDKIT=1 docker build \ DOCKER_BUILDKIT=1 docker build \
--platform="${PLATFORM}" \ --platform="${PLATFORM:-Linux/amd64}" \
--tag="${CONTAINER_IMAGE}" \ --tag="${CONTAINER_IMAGE:-invokeai}" \
${CONTAINER_FLAVOR:+--build-arg="CONTAINER_FLAVOR=${CONTAINER_FLAVOR}"} \
${PIP_EXTRA_INDEX_URL:+--build-arg="PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}"} \ ${PIP_EXTRA_INDEX_URL:+--build-arg="PIP_EXTRA_INDEX_URL=${PIP_EXTRA_INDEX_URL}"} \
${PIP_PACKAGE:+--build-arg="PIP_PACKAGE=${PIP_PACKAGE}"} \ ${PIP_PACKAGE:+--build-arg="PIP_PACKAGE=${PIP_PACKAGE}"} \
--file="${DOCKERFILE}" \ --file="${DOCKERFILE:-./Dockerfile}" \
.. ..

2
docker/run.sh
View File

@ -28,4 +28,4 @@ docker run \
--publish=9090:9090 \ --publish=9090:9090 \
--cap-add=sys_nice \ --cap-add=sys_nice \
${GPU_FLAGS:+--gpus="${GPU_FLAGS}"} \ ${GPU_FLAGS:+--gpus="${GPU_FLAGS}"} \
"${CONTAINER_IMAGE}" ${1:+$@} "${CONTAINER_IMAGE}" ${@:+$@}