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

build(Makefile): resort to default .stack-work for all jobs

Browse Source
This commit is contained in:
Sarah Vaupel 2024-11-12 01:15:02 +01:00
parent 54ecbe4e7a
commit 4d19773223
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -68,7 +68,7 @@ help:
clean: clean:
rm -rf develop rm -rf develop
-rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json -rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json
-rm -rf .job-* -rm -rf .stack-work .stack-work.lock
-rm -rf bin .Dockerfile develop -rm -rf bin .Dockerfile develop
-$(CONTAINER_COMMAND) container prune --force -$(CONTAINER_COMMAND) container prune --force
.PHONY: clean-all .PHONY: clean-all
@ -106,24 +106,18 @@ start:
%-backend: SERVICE=backend %-backend: SERVICE=backend
%-backend: SERVICE_VARIANT=backend %-backend: SERVICE_VARIANT=backend
%-backend: CONTAINER_CMD=localhost/fradrive/backend %-backend: CONTAINER_CMD=localhost/fradrive/backend
# %-backend: CONTAINER_INIT="$(STACK_INIT)"
# %-backend: CONTAINER_CLEANUP="$(STACK_CLEANUP)"
%-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443" %-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
.PHONY: %-uniworxdb .PHONY: %-uniworxdb
%-uniworxdb: SERVICE=backend %-uniworxdb: SERVICE=backend
%-uniworxdb: SERVICE_VARIANT=uniworxdb %-uniworxdb: SERVICE_VARIANT=uniworxdb
%-uniworxdb: CONTAINER_CMD=localhost/fradrive/backend %-uniworxdb: CONTAINER_CMD=localhost/fradrive/backend
# %-uniworxdb: CONTAINER_INIT="$(STACK_INIT)"
# %-uniworxdb: CONTAINER_CLEANUP="$(STACK_CLEANUP)"
.PHONY: %-hoogle .PHONY: %-hoogle
%-hoogle: SERVICE=backend %-hoogle: SERVICE=backend
%-hoogle: SERVICE_VARIANT=hoogle %-hoogle: SERVICE_VARIANT=hoogle
%-hoogle: BASE_PORTS = "HOOGLE_PORT=8081" %-hoogle: BASE_PORTS = "HOOGLE_PORT=8081"
%-hoogle: CONTAINER_CMD=localhost/fradrive/backend %-hoogle: CONTAINER_CMD=localhost/fradrive/backend
# %-hoogle: CONTAINER_INIT="$(STACK_INIT)"
# %-hoogle: CONTAINER_CLEANUP="$(STACK_CLEANUP)"
--start-hoogle: --start-hoogle:
HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \ HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT} stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT}
@ -203,7 +197,6 @@ rebuild-%:
ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)" ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)"
rm -f .Dockerfile rm -f .Dockerfile
ln -s docker/$(SERVICE)/Dockerfile .Dockerfile ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
$(MAKE) .job-$(JOB)
MOUNT_DIR=/mnt/fradrive; \ MOUNT_DIR=/mnt/fradrive; \
PROJECT_DIR=/mnt/fradrive; \ PROJECT_DIR=/mnt/fradrive; \
if [ "$(IN_CI)" == "true" ] ; then \ if [ "$(IN_CI)" == "true" ] ; then \
@ -223,9 +216,7 @@ else
: :
endif endif
--containerized: --containerized: --image-build
$(MAKE) .job-$(JOB)
$(MAKE) -- --image-build
DEVELOP=`cat develop/.current` ; \ DEVELOP=`cat develop/.current` ; \
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \ ./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \
CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \ CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
@ -280,9 +271,6 @@ endif
# HELP(test-backend): test backend # HELP(test-backend): test backend
--test-backend: --test-backend:
stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT) stack build $(STACK_CORES) --test --coverage --fast --flag uniworx:library-only $(--DEVELOPMENT)
.PHONY: .job-%
.job-%:
./utils/dirsymlink.pl ".job-$*" .stack-work
# HELP(compile-frontend): compile frontend assets # HELP(compile-frontend): compile frontend assets
--compile-frontend: node_modules assets esbuild.config.mjs --compile-frontend: node_modules assets esbuild.config.mjs

7
docker/backend/Dockerfile
View File

@ -18,12 +18,11 @@ RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r "${MOUNT_DIR}"/* "${P
RUN mkdir -p "${PROJECT_DIR}/.stack" RUN mkdir -p "${PROJECT_DIR}/.stack"
ENV STACK_ROOT="${PROJECT_DIR}/.stack" ENV STACK_ROOT="${PROJECT_DIR}/.stack"
WORKDIR "${PROJECT_DIR}/.job-${JOB}" WORKDIR ${PROJECT_DIR}
ENV HOME="${PROJECT_DIR}/.job-${JOB}" ENV HOME=${PROJECT_DIR}
RUN make -- --dependencies-backend STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true JOB=${JOB} RUN make -- --dependencies-backend STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true JOB=${JOB}
RUN cd "${PROJECT_DIR}" && make .job-start RUN stack install yesod-bin
RUN cd "${PROJECT_DIR}/.job-start" && STACK_ROOT=${STACK_ROOT} stack install yesod-bin
ENV FRADRIVE_MAKE_TARGET=--start-backend ENV FRADRIVE_MAKE_TARGET=--start-backend
ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}" ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}" JOB="${JOB}"