fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build(Makefile): eliminate MOUNT_DIR in favor of PROJECT_DIR [skip ci]

Browse Source
This commit is contained in:
Sarah Vaupel 2025-01-24 02:39:28 +01:00
parent 3416942591
commit c83ed1fc39
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -22,10 +22,10 @@ export CONTAINER_FILE
export CONTAINER_IDENT export CONTAINER_IDENT
export CF_PREFIX export CF_PREFIX
export DEVELOP export DEVELOP
export MOUNT_DIR=/mnt/fradrive
export CONTAINER_ATTACHED export CONTAINER_ATTACHED
export CONTAINER_INIT export CONTAINER_INIT
export CONTAINER_CLEANUP export CONTAINER_CLEANUP
export PROJECT_DIR=/fradrive
export SERVICE export SERVICE
export SERVICE_VARIANT ?= $(SERVICE) export SERVICE_VARIANT ?= $(SERVICE)
@ -210,15 +210,10 @@ rebuild-%:
ifeq "$(IMAGE)" "localhost/fradrive/$(SERVICE)" ifeq "$(IMAGE)" "localhost/fradrive/$(SERVICE)"
rm -f .Dockerfile rm -f .Dockerfile
ln -s docker/$(SERVICE)/Dockerfile .Dockerfile ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
MOUNT_DIR=/mnt/fradrive; \ PROJECT_DIR=/fradrive; \
PROJECT_DIR=/mnt/fradrive; \
if [ "$(IN_CI)" == "true" ] ; then \
PROJECT_DIR=/fradrive; \
fi; \
if [ "$(IN_CONTAINER)" == "false" ] ; then \ if [ "$(IN_CONTAINER)" == "false" ] ; then \
$(CONTAINER_COMMAND) build $(NO_CACHE) \ $(CONTAINER_COMMAND) build $(NO_CACHE) \
-v $(PWD):$${MOUNT_DIR}:rw \ -v $(PWD):$${PROJECT_DIR}:rw \
--build-arg MOUNT_DIR=$(MOUNT_DIR) \
--build-arg PROJECT_DIR=$${PROJECT_DIR} \ --build-arg PROJECT_DIR=$${PROJECT_DIR} \
--env IN_CONTAINER=true \ --env IN_CONTAINER=true \
--env JOB=$(JOB) \ --env JOB=$(JOB) \
@ -240,7 +235,7 @@ endif
IMAGE=$(IMAGE) ; \ IMAGE=$(IMAGE) ; \
fi ; \ fi ; \
CONTAINER_ID=`$(CONTAINER_BGRUN) \ CONTAINER_ID=`$(CONTAINER_BGRUN) \
-v $(PWD):$(MOUNT_DIR) \ -v $(PWD):$(PROJECT_DIR):rw \
--env IN_CONTAINER=true \ --env IN_CONTAINER=true \
--env CONTAINER_FILE=$(CONTAINER_FILE) \ --env CONTAINER_FILE=$(CONTAINER_FILE) \
--env CONTAINER_NAME=$${CONTAINER_NAME} \ --env CONTAINER_NAME=$${CONTAINER_NAME} \

9
docker/frontend/Dockerfile
View File

@ -19,20 +19,11 @@ RUN if [ ! -z "${HTTP_PROXY}" ]; then npm config set proxy ${HTTP_PROXY}; fi
RUN if [ ! -z "${FRAPORT_NOPROXY}" ]; then npm config set noproxy "${FRAPORT_NOPROXY}"; fi RUN if [ ! -z "${FRAPORT_NOPROXY}" ]; then npm config set noproxy "${FRAPORT_NOPROXY}"; fi
ENV NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt" ENV NODE_EXTRA_CA_CERTS="/etc/ssl/certs/ca-certificates.crt"
# locally these two should be identical, so that compilation results are written out into the file dir.
# in CI-pipelines these two should be different, so that the container caches the compilation results.
ARG MOUNT_DIR=/mnt/fradrive
ENV PROJECT_DIR=/fradrive ENV PROJECT_DIR=/fradrive
RUN mkdir -p ${PROJECT_DIR} RUN mkdir -p ${PROJECT_DIR}
RUN --mount=type=bind,source=.,target=${MOUNT_DIR},rw if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r ${MOUNT_DIR}/* ${PROJECT_DIR} ; fi
WORKDIR ${PROJECT_DIR} WORKDIR ${PROJECT_DIR}
ENV HOME=${PROJECT_DIR} ENV HOME=${PROJECT_DIR}
RUN if [ ! -z "${NPM_CUSTOM_REGISTRY}" ]; then \ RUN if [ ! -z "${NPM_CUSTOM_REGISTRY}" ]; then \
printf 'registry=${NPM_CUSTOM_REGISTRY}' > .npmrc \ printf 'registry=${NPM_CUSTOM_REGISTRY}' > .npmrc \
; fi ; fi
# RUN make -- --dependencies-frontend IN_CONTAINER=true
# ENV FRADRIVE_MAKE_TARGET=--compile-frontend
# ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} IN_CONTAINER=true CHROME_BIN=${CHROME_BIN} PROJECT_DIR=${PROJECT_DIR}