build(Makefile): rename CONTAINER_CMD -> IMAGE; remove unnecessary make calls in Dockerfile

Makefile

@@ -30,8 +30,8 @@ export CONTAINER_CLEANUP
 export SERVICE
 export SERVICE_VARIANT ?= $(SERVICE)
 export JOB
-export CONTAINER_CMD
-export SET_CONTAINER_CMD
+export IMAGE
+export SET_IMAGE
 export ENTRYPOINT
 export EXEC_OPTS
 
@@ -103,24 +103,24 @@ start:
 .PHONY: %-backend
 %-backend: SERVICE=backend
 %-backend: SERVICE_VARIANT=backend
-%-backend: CONTAINER_CMD=localhost/fradrive/backend
+%-backend: IMAGE=localhost/fradrive/backend
 %-backend: BASE_PORTS = "DEV_PORT_HTTP=3000" "DEV_PORT_HTTPS=3443"
 
 .PHONY: %-uniworxdb
 %-uniworxdb: SERVICE=backend
 %-uniworxdb: SERVICE_VARIANT=uniworxdb
-%-uniworxdb: CONTAINER_CMD=localhost/fradrive/backend
+%-uniworxdb: IMAGE=localhost/fradrive/backend
 
 .PHONY: %-ghci
 %-ghci: SERVICE=backend
 %-ghci: SERVICE_VARIANT=ghci
-%-ghci: CONTAINER_CMD=localhost/fradrive/backend
+%-ghci: IMAGE=localhost/fradrive/backend
 
 .PHONY: %-hoogle
 %-hoogle: SERVICE=backend
 %-hoogle: SERVICE_VARIANT=hoogle
 %-hoogle: BASE_PORTS = "HOOGLE_PORT=8081"
-%-hoogle: CONTAINER_CMD=localhost/fradrive/backend
+%-hoogle: IMAGE=localhost/fradrive/backend
 --start-hoogle:
 	HOOGLE_PORT=`cat $(CONTAINER_FILE) | grep 'HOOGLE_PORT=' | sed 's/HOOGLE_PORT=//'` ; \
 	stack $(STACK_CORES) hoogle -- server --local --port $${HOOGLE_PORT}
@@ -128,24 +128,24 @@ start:
 .PHONY: %-frontend
 %-frontend: SERVICE=frontend
 %-frontend: SERVICE_VARIANT=frontend
-%-frontend: CONTAINER_CMD=localhost/fradrive/frontend
+%-frontend: IMAGE=localhost/fradrive/frontend
 
 .PHONY: %-postgres
 %-postgres: SERVICE=postgres
 %-postgres: SERVICE_VARIANT=postgres
 %-postgres: BASE_PORTS = "PGPORT=5432"
-%-postgres: CONTAINER_CMD=localhost/fradrive/postgres
+%-postgres: IMAGE=localhost/fradrive/postgres
 
 .PHONY: %-memcached
 %-memcached: SERVICE=memcached
 %-memcached: SERVICE_VARIANT=memcached
-%-memcached: SET_CONTAINER_CMD=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
+%-memcached: SET_IMAGE=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
 %-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
 
 .PHONY: %-minio
 %-minio: SERVICE=minio
 %-minio: SERVICE_VARIANT=minio
-%-minio: SET_CONTAINER_CMD=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
+%-minio: SET_IMAGE=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
 %-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"
 
 .PHONY: start-%
@@ -207,7 +207,7 @@ ghci: shell-ghci;
 rebuild-%:
 	$(MAKE) -- --image-build SERVICE=$* NO_CACHE=--no-cache
 --image-build:
-ifeq "$(CONTAINER_CMD)" "localhost/fradrive/$(SERVICE)"
+ifeq "$(IMAGE)" "localhost/fradrive/$(SERVICE)"
 	rm -f .Dockerfile
 	ln -s docker/$(SERVICE)/Dockerfile .Dockerfile
 	MOUNT_DIR=/mnt/fradrive; \
@@ -233,22 +233,22 @@ endif
 	DEVELOP=`cat develop/.current` ; \
 	./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" "$(CONTAINER_INIT)" "$(CONTAINER_CLEANUP)" & \
 	CONTAINER_NAME=fradrive.$(CURR_DEV).$(CONTAINER_IDENT) ; \
-	if ! [ -z "$(SET_CONTAINER_CMD)" ] ; \
+	if ! [ -z "$(SET_IMAGE)" ] ; \
 	  then \
-	    CONTAINER_CMD="$(SET_CONTAINER_CMD)" ; \
+	    IMAGE="$(SET_IMAGE)" ; \
 	  else \
-	    CONTAINER_CMD=$(CONTAINER_CMD) ; \
+	    IMAGE=$(IMAGE) ; \
 	fi ; \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) \
 	  -v $(PWD):$(MOUNT_DIR) \
 	  --env IN_CONTAINER=true \
-	  --env FRADRIVE_MAKE_TARGET="--$(JOB)-$(SERVICE_VARIANT)" \
 	  --env CONTAINER_FILE=$(CONTAINER_FILE) \
 	  --env CONTAINER_NAME=$${CONTAINER_NAME} \
 	  --env JOB=$(JOB) \
 	  --env SRC=$(SRC) \
 	  --name $${CONTAINER_NAME} \
-	  $${CONTAINER_CMD} \
+	  $${IMAGE} \
+	  make -- --$(JOB)-$(SERVICE_VARIANT) IN_CONTAINER=true \
 	` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
 	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \
@@ -256,7 +256,6 @@ endif
 	fi
 
 # For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J
-
 # HELP(start-backend): start development instance
 --start-backend:
 	export YESOD_IP_FROM_HEADER=true; \

docker/frontend/Dockerfile

@@ -33,7 +33,7 @@ RUN if [ ! -z "${NPM_CUSTOM_REGISTRY}" ]; then \
 printf 'registry=${NPM_CUSTOM_REGISTRY}' > .npmrc \
 ; fi
 
-RUN make -- --dependencies-frontend IN_CONTAINER=true
+# 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}
+# ENV FRADRIVE_MAKE_TARGET=--compile-frontend
+# ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} IN_CONTAINER=true CHROME_BIN=${CHROME_BIN} PROJECT_DIR=${PROJECT_DIR}