diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 6a9569c301..d8caa8099c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -15,16 +15,13 @@ ENV APK_CACHE_DIR="/home/owasp/.cache/apk" \ POETRY_VIRTUALENVS_IN_PROJECT=true \ PYTHONUNBUFFERED=1 -RUN mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ - ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} - RUN --mount=type=cache,target=${APK_CACHE_DIR} \ +mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ + ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} && \ apk update && apk upgrade && \ addgroup -S -g ${OWASP_GID} owasp && \ adduser -S -h /home/owasp -u ${OWASP_UID} -G owasp owasp && \ - chown -R owasp:owasp /home/owasp - -RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ + chown -R owasp:owasp /home/owasp && \ python -m pip install poetry --cache-dir ${PIP_CACHE_DIR} WORKDIR /home/owasp diff --git a/docker/backend/Dockerfile.fuzz b/docker/backend/Dockerfile.fuzz index 75d06b16dd..ea6ad598e2 100644 --- a/docker/backend/Dockerfile.fuzz +++ b/docker/backend/Dockerfile.fuzz @@ -8,16 +8,14 @@ ENV PIP_CACHE_DIR="/home/owasp/.cache/pip" \ APK_SYMLINK_DIR="/etc/apk/cache" \ FORCE_COLOR=1 -RUN mkdir -p ${APK_CACHE_DIR} && \ - ln -s ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} - RUN --mount=type=cache,target=${APK_CACHE_DIR} \ + --mount=type=cache,target=${PIP_CACHE_DIR} \ + mkdir -p ${APK_CACHE_DIR} && \ + ln -s ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} && \ apk update && apk upgrade && \ apk add curl jq && \ addgroup -S owasp && \ - adduser -S -h /home/owasp -G owasp owasp - -RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ + adduser -S -h /home/owasp -G owasp owasp && \ python -m pip install --upgrade pip && \ pip install schemathesis --cache-dir ${PIP_CACHE_DIR} diff --git a/docker/backend/Dockerfile.local b/docker/backend/Dockerfile.local index 84994c2807..7ecfd5c6d2 100644 --- a/docker/backend/Dockerfile.local +++ b/docker/backend/Dockerfile.local @@ -11,16 +11,14 @@ ENV APK_CACHE_DIR="/home/owasp/.cache/apk-backend-builder" \ POETRY_VIRTUALENVS_IN_PROJECT=true \ PYTHONUNBUFFERED=1 -RUN mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ - ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} - RUN --mount=type=cache,target=${APK_CACHE_DIR} \ + --mount=type=cache,target=${PIP_CACHE_DIR} \ + mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ + ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} && \ apk update && apk upgrade && \ addgroup -S -g ${OWASP_GID} owasp && \ adduser -S -h /home/owasp -u ${OWASP_UID} -G owasp owasp && \ - chown -R owasp:owasp /home/owasp - -RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ + chown -R owasp:owasp /home/owasp && \ python -m pip install poetry --cache-dir ${PIP_CACHE_DIR} USER owasp @@ -41,16 +39,14 @@ ENV APK_CACHE_DIR="/home/owasp/.cache/apk-backend-stage" \ PATH="/home/owasp/.venv/bin:$PATH" \ PYTHONUNBUFFERED=1 -RUN mkdir -p ${APK_CACHE_DIR} && \ - ln -s ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} - RUN --mount=type=cache,target=${APK_CACHE_DIR} \ + --mount=type=cache,target=${PIP_CACHE_DIR} \ + mkdir -p ${APK_CACHE_DIR} && \ + ln -s ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} && \ apk update && apk upgrade && \ apk add postgresql16-client redis && \ addgroup -S owasp && \ - adduser -S -h /home/owasp -G owasp owasp - -RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ + adduser -S -h /home/owasp -G owasp owasp&& \ python -m pip install poetry --cache-dir ${PIP_CACHE_DIR} EXPOSE 8000 diff --git a/docker/backend/Dockerfile.test b/docker/backend/Dockerfile.test index f105bc1e2e..56723913ed 100644 --- a/docker/backend/Dockerfile.test +++ b/docker/backend/Dockerfile.test @@ -9,16 +9,14 @@ ENV APK_CACHE_DIR="/home/owasp/.cache/apk-backend-test" \ POETRY_VIRTUALENVS_IN_PROJECT=true \ PYTHONUNBUFFERED=1 -RUN mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ - ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} - RUN --mount=type=cache,target=${APK_CACHE_DIR} \ + --mount=type=cache,target=${PIP_CACHE_DIR} \ + mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ + ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR}&& \ apk update && apk upgrade && \ addgroup -S -g ${OWASP_GID} owasp && \ adduser -S -h /home/owasp -u ${OWASP_UID} -G owasp owasp && \ - chown -R owasp:owasp /home/owasp - -RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ + chown -R owasp:owasp /home/owasp && \ python -m pip install poetry --cache-dir ${PIP_CACHE_DIR} WORKDIR /home/owasp diff --git a/docker/backend/Dockerfile.video b/docker/backend/Dockerfile.video index 489e288ba0..e89c2f8f5e 100644 --- a/docker/backend/Dockerfile.video +++ b/docker/backend/Dockerfile.video @@ -11,18 +11,16 @@ ENV APK_CACHE_DIR="/home/owasp/.cache/apk-backend-video" \ POETRY_VIRTUALENVS_IN_PROJECT=true \ PYTHONUNBUFFERED=1 -RUN mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ - ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} - RUN --mount=type=cache,target=${PIP_CACHE_DIR} \ + mkdir -p ${APK_CACHE_DIR} ${POETRY_CACHE_DIR} && \ + ln -fns ${APK_CACHE_DIR} ${APK_SYMLINK_DIR} && \ python -m pip install poetry --cache-dir ${PIP_CACHE_DIR} COPY --chmod=444 --chown=root:root poetry.lock pyproject.toml ./ RUN --mount=type=cache,target=${POETRY_CACHE_DIR},uid=${OWASP_UID},gid=${OWASP_GID} \ + --mount=type=cache,target=${APK_CACHE_DIR} \ poetry install --no-root --without dev --without test && \ - python -m pip uninstall -y poetry - -RUN --mount=type=cache,target=${APK_CACHE_DIR} \ + python -m pip uninstall -y poetry && \ apk update && apk upgrade && \ apk add ffmpeg \ # WeasyPrint dependencies: https://doc.courtbouillon.org/weasyprint/stable/first_steps.html