build(docker/backend): make stack dirs deletable by all (i.e. clean)

Makefile

@@ -171,10 +171,10 @@ well-known: static;
 %-backend: FRADRIVE_SERVICE=backend
 %-backend: --image-build --containerized---%-backend;
 
---start-backend: start.sh
+--start-backend:
 	DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
 	DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
-	./start.sh
+	stack --work-dir .stack-work-run exec -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
 --start-hoogle-backend:
 	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
 	echo "${HOOGLE_PORT}" ; \
@@ -291,6 +291,7 @@ image-rebuild-%:
 	  if [ -z "$(CONTAINER_FILE)" ] ; then \
 	    $(CONTAINER_FGRUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env CONTAINER_FILE=$(CONTAINER_FILE) --env CONTAINER_FILE_CONTENT=$(CONTAINER_FILE_CONTENT) --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE) ; \
 	  else \
+	  	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
 	    CONTAINER_ID=`$(CONTAINER_BGRUN) -v $(PWD):$${MOUNT_DIR} --env IN_CONTAINER=true --env FRADRIVE_MAKE_TARGET=$* --env CONTAINER_FILE=$(CONTAINER_FILE) --env CONTAINER_FILE_CONTENT=$(CONTAINER_FILE_CONTENT) --env WATCH=$(WATCH) --name fradrive.$(FRADRIVE_SERVICE).$$(date +'%Y-%m-%dT%H-%M-%S') localhost/fradrive/$(FRADRIVE_SERVICE)` ; \
 	    echo "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)"; \
 	  fi \
@@ -362,8 +363,8 @@ stop-container-by-id:
 
 .PHONY: log-%
 # HELP(log-{database,memcached,minio,backend,frontend,hoogle}): inspect output of a given (currently running) service. When a service supports multiple running instances in one develop (i.e. backend), you need to specify the exact instance by its associated file (e.g. backend-1, backend-2, etc.), please check the contents of the develop/ directory for a list of running instances.
-log-%:
-	$(CONTAINER_COMMAND) logs --follow --tail=$(LOGSIZE) `cat develop/$(CURRENT_DEVELOP)/$* | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'`
+log-%: --develop
+	$(CONTAINER_COMMAND) logs --follow --tail=$(LOGSIZE) `cat $(DEVELOP)/$* | grep CONTAINER_ID= | sed 's/^CONTAINER_ID=//'`
 
 ##### CONTAINER TARGETS #####
 #############################
@@ -373,7 +374,8 @@ log-%:
 
 DATE := $(shell date +'%Y-%m-%dT%H-%M-%S')
 
-SET_DEVELOP = $(eval DEVELOP=develop/`ls -1 develop | tail -n1`)
+CURR_DEV = $(shell ls -1 develop | tail -n1)
+SET_DEVELOP = $(eval DEVELOP=develop/$$(CURR_DEV))
 NEW_DEVELOP = $(eval DEVELOP=develop/$$(DATE))
 
 .PHONY: new-develop

docker/backend/Dockerfile

@@ -22,7 +22,7 @@ ENV STACK_ROOT="${PROJECT_DIR}/.stack"
 
 RUN make -- --.stack STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true
 RUN stack build yesod-bin
-RUN chmod 777 .stack .stack-work-build .stack-work-run .stack-work-test .stack-work-doc || :
+RUN chmod -R 777 .stack .stack-work-build .stack-work-run .stack-work-test .stack-work-doc || :
 
 ENV FRADRIVE_MAKE_TARGET=start-backend
 ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} STACK_ROOT="${STACK_ROOT}" IN_CONTAINER=true CONTAINER_FILE="${CONTAINER_FILE}"

start.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor.kleen@ifi.lmu.de>, Sarah Vaupel <vaupel.sarah@campus.lmu.de>, Steffen Jost <jost@tcs.ifi.lmu.de>
-#
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-
-__HOST=${HOST:-$(hostname -s | awk '{ print $0; }')}
-
-export DETAILED_LOGGING=${DETAILED_LOGGING:-true}
-export LOG_ALL=${LOG_ALL:-false}
-export LOGLEVEL=${LOGLEVEL:-info}
-export DUMMY_LOGIN=${DUMMY_LOGIN:-true}
-export SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true}
-export SERVER_SESSION_COOKIES_SECURE=${SERVER_SESSION_COOKIES_SECURE:-false}
-export COOKIES_SECURE=${COOKIES_SECURE:-false}
-export ALLOW_DEPRECATED=${ALLOW_DEPRECATED:-true}
-export ENCRYPT_ERRORS=${ENCRYPT_ERRORS:-false}
-export RIBBON=${RIBBON:-${__HOST:-localhost}}
-export APPROOT=${APPROOT:-http://localhost:$DEV_PORT_HTTP}
-export AVSPASS=${AVSPASS:-nopasswordset}
-unset HOST
-
-# export PORT_OFFSET=$(((16#$(sha256sum <<<"$(hostname -f):''${basePath}" | head -c 16)) % 1000))
-
-# move-back() {
-#     mv -vT .stack-work .stack-work-run
-#     [[ -d .stack-work-build ]] && mv -vT .stack-work-build .stack-work
-# }
-
-# if [[ -d .stack-work-run ]]; then
-#     [[ -d .stack-work ]] && mv -vT .stack-work .stack-work-build
-#     mv -vT .stack-work-run .stack-work
-#     trap move-back EXIT
-# fi
-
-if ! [ -z "$(which stack)" ]
-then
-  stack --jobs 4 --work-dir .stack-work-run exec -- yesod devel -p "$DEV_PORT_HTTP" -q "$DEV_PORT_HTTPS" $@
-else
-  exit 1
-fi