Skip to content

chore(docker): merge consecutive RUN instructions #3473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zarfishan20 wants to merge 7 commits into from
Closed

chore(docker): merge consecutive RUN instructions #3473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f098e1a
Fix Dockerfile syntax and cache mount commands
zarfishan20 Jan 19, 2026
e12f3ef
Fix Dockerfile.fuzz cache mount syntax
zarfishan20 Jan 19, 2026
d00d8ca
Refactor Dockerfile.local to use cache mounts correctly
zarfishan20 Jan 19, 2026
8e89df0
Fix Dockerfile test cache mount syntax
zarfishan20 Jan 19, 2026
288bff8
Fix Dockerfile.video cache mount syntax
zarfishan20 Jan 19, 2026
fbd970b
Merge branch 'OWASP:main' into main
zarfishan20 Jan 22, 2026
9837819
fixed issues
zarfishan20 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions docker/backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions docker/backend/Dockerfile.fuzz
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down
20 changes: 8 additions & 12 deletions docker/backend/Dockerfile.local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 4 additions & 6 deletions docker/backend/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions docker/backend/Dockerfile.video
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down