Merge branch '145-build-system-rewrite'

Makefile

@@ -144,7 +144,7 @@ start:
 %-postgres: SERVICE=postgres
 %-postgres: SERVICE_VARIANT=postgres
 %-postgres: BASE_PORTS = "PGPORT=5432"
-%-postgres: IMAGE=localhost/fradrive/postgres
+%-postgres: SET_IMAGE=localhost/fradrive/postgres
 
 .PHONY: %-memcached
 %-memcached: SERVICE=memcached
@@ -243,6 +243,7 @@ endif
 	    IMAGE="$(SET_IMAGE)" ; \
 	  else \
 	    IMAGE=$(IMAGE) ; \
+		MAKECALL="make -- --$(JOB)-$(SERVICE_VARIANT) IN_CONTAINER=true" ; \
 	fi ; \
 	CONTAINER_ID=`$(CONTAINER_BGRUN) \
 	  -v $(PWD):$(PROJECT_DIR):rw \
@@ -253,7 +254,7 @@ endif
 	  --env SRC=$(SRC) \
 	  --name $${CONTAINER_NAME} \
 	  $${IMAGE} \
-	  make -- --$(JOB)-$(SERVICE_VARIANT) IN_CONTAINER=true \
+	  $${MAKECALL} \
 	` ; \
 	printf "CONTAINER_ID=$${CONTAINER_ID}" >> "$(CONTAINER_FILE)" ; \
 	if [[ "true" == "$(CONTAINER_ATTACHED)" ]] ; then \