epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-17 13:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat(security): add dynamic resolution for FRAPPE_PATH in Containerfile

Browse source 
adds a dynamic resolution for folks that are using a private repo for the frappe app, and are using tokens to authenticate

Signed-off-by: ismail <38789073+ismxilxrif@users.noreply.github.com>
This commit is contained in:
ismail 2026-04-20 04:17:04 +00:00
parent f8cfe4cb82
commit 097dcc52a1
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
images/custom/Containerfile
View file

@ -119,13 +119,19 @@ USER frappe
ARG FRAPPE_BRANCH=version-16
ARG FRAPPE_PATH=https://github.com/frappe/frappe
RUN --mount=type=secret,id=apps_json,target=/opt/frappe/apps.json,uid=1000,gid=1000 \
--mount=type=secret,id=frappe_path,target=/tmp/frappe_path,uid=1000,gid=1000 \
export APP_INSTALL_ARGS="" && \
if [ -f /tmp/frappe_path ] && [ -s /tmp/frappe_path ]; then \
RESOLVED_PATH=$(cat /tmp/frappe_path); \
else \
RESOLVED_PATH=${FRAPPE_PATH}; \
fi && \
if [ -f /opt/frappe/apps.json ] && [ -s /opt/frappe/apps.json ]; then \
export APP_INSTALL_ARGS="--apps_path=/opt/frappe/apps.json"; \
fi && \
bench init ${APP_INSTALL_ARGS}\
bench init ${APP_INSTALL_ARGS} \
--frappe-branch=${FRAPPE_BRANCH} \
--frappe-path=${FRAPPE_PATH} \
--frappe-path=${RESOLVED_PATH} \
--no-procfile \
--no-backups \
--skip-redis-config-generation \

16
images/layered/Containerfile
View file

@ -1,21 +1,27 @@
ARG FRAPPE_BRANCH=version-16
ARG FRAPPE_BUILD=${FRAPPE_BRANCH}
ARG FRAPPE_IMAGE_PREFIX=frappe
FROM ${FRAPPE_IMAGE_PREFIX}/build:${FRAPPE_BRANCH} AS builder
FROM ${FRAPPE_IMAGE_PREFIX}/build:${FRAPPE_BUILD} AS builder
ARG FRAPPE_BRANCH=version-16
ARG FRAPPE_PATH=https://github.com/frappe/frappe
USER frappe
RUN --mount=type=secret,id=apps_json,target=/opt/frappe/apps.json,uid=1000,gid=1000 \
--mount=type=secret,id=frappe_path,target=/tmp/frappe_path,uid=1000,gid=1000 \
export APP_INSTALL_ARGS="" && \
if [ -f /tmp/frappe_path ] && [ -s /tmp/frappe_path ]; then \
RESOLVED_PATH=$(cat /tmp/frappe_path); \
else \
RESOLVED_PATH=${FRAPPE_PATH}; \
fi && \
if [ -f /opt/frappe/apps.json ] && [ -s /opt/frappe/apps.json ]; then \
export APP_INSTALL_ARGS="--apps_path=/opt/frappe/apps.json"; \
fi && \
bench init ${APP_INSTALL_ARGS}\
bench init ${APP_INSTALL_ARGS} \
--frappe-branch=${FRAPPE_BRANCH} \
--frappe-path=${FRAPPE_PATH} \
--frappe-path=${RESOLVED_PATH} \
--no-procfile \
--no-backups \
--skip-redis-config-generation \
@ -25,7 +31,7 @@ RUN --mount=type=secret,id=apps_json,target=/opt/frappe/apps.json,uid=1000,gid=1
echo "{}" > sites/common_site_config.json && \
find apps -mindepth 1 -path "*/.git" | xargs rm -fr
FROM ${FRAPPE_IMAGE_PREFIX}/base:${FRAPPE_BRANCH} AS backend
FROM ${FRAPPE_IMAGE_PREFIX}/base:${FRAPPE_BUILD} AS backend
USER frappe