Compare commits

...

4 Commits

Author SHA1 Message Date
lainedfles
4f9cff9cf4
Merge c6b7d2f79a into 802d0bcd68 2024-11-17 04:36:05 +00:00
Self Denial
c6b7d2f79a fix: return to sh 2024-11-16 21:35:12 -07:00
Self Denial
dfe8078b1b fix: use bash with bash syntax! 2024-11-16 21:29:32 -07:00
Self Denial
3fe1785653 fix: execute krita model download with proper path 2024-11-16 20:44:29 -07:00
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ RUN groupadd -r app -g ${USE_GID} && useradd --no-log-init -m -r -g app app -u $
mkdir -p ${ROOT} && chown ${USE_UID}:${USE_GID} ${ROOT} && mkdir -p ${CACHE}/pip && chown -R ${USE_UID}:${USE_GID} ${CACHE}
RUN --mount=type=cache,uid=${USE_UID},gid=${USE_GID},target=${CACHE} chown -R ${USE_UID}:${USE_UID} ${CACHE}
RUN apt-get update && apt-get install -y git && ([[ "${USE_XFLUX}" == "true" || "${USE_KRITA}" == "true" || "${USE_CNAUX}" == "true" ]] && apt-get install -y libgl1-mesa-glx python3-opencv) && apt-get clean
RUN apt-get update && apt-get install -y git && (if [ "${USE_XFLUX}" = "true" ] || [ "${USE_KRITA}" = "true" ] || [ "${USE_CNAUX}" = "true" ]; then apt-get install -y libgl1-mesa-glx python3-opencv; fi) && apt-get clean
USER app:app
ENV PATH="${PATH}:/home/app/.local/bin"

View File

@ -26,7 +26,7 @@ done
if [ "${USE_KRITA}" = "true" ]; then
if [ "${KRITA_DOWNLOAD_MODELS:-false}" = "true" ]; then
cd "${ROOT}/krita-ai-diffusion/scripts" && python scripts/download_models.py --recommended /data && cd ..
cd "${ROOT}/krita-ai-diffusion/scripts" && python download_models.py --recommended /data && cd ..
fi
[ -d "${ROOT}/models/upscale_models" ] && mv -v "${ROOT}/models/upscale_models" "${ROOT}/models/upscale_models.stock"
if [ ! -L "${ROOT}/models/upscale_models" ]; then