Maintenance/minio endpoint and qooxdoo compiler logs (#1442)

* auto follow qx compiler logs in devel mode
* set minio to use the docker0 interface

Author: sanderegg

.env-devel

@@ -32,7 +32,8 @@ DIRECTOR_REGISTRY_CACHING_TTL=900
 
 S3_ACCESS_KEY=12345678
 S3_BUCKET_NAME=simcore
-S3_ENDPOINT=minio:9000
+# 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
+S3_ENDPOINT=172.17.0.1:9001
 S3_SECRET_KEY=12345678
 S3_SECURE=0
 

Makefile

@@ -190,10 +190,11 @@ endif
 
 up-devel: .stack-simcore-development.yml .init-swarm $(CLIENT_WEB_OUTPUT) ## Deploys local development stack, qx-compile+watch and ops stack (pass 'make ops_disabled=1 up-...' to disable)
 	# Start compile+watch front-end container [front-end]	
-	$(MAKE) -C services/web/client compile-dev flags=--watch
+	$(MAKE_C) services/web/client compile-dev flags=--watch
 	# Deploy stack $(SWARM_STACK_NAME) [back-end]
 	@docker stack deploy -c $< $(SWARM_STACK_NAME)
 	$(MAKE) .deploy-ops
+	$(MAKE_C) services/web/client follow-dev-logs
 
 
 up-prod: .stack-simcore-production.yml .init-swarm ## Deploys local production stack and ops stack (pass 'make ops_disabled=1 up-...' to disable)

services/web/client/Makefile

@@ -11,6 +11,7 @@ docker_compose := docker-compose -f tools/docker-compose.yml
 docker_file    := tools/qooxdoo-kit/builder/Dockerfile
 docker_image   := client/$(subst /Dockerfile,,$(docker_file)):latest
 
+container_name := qooxdoo-compiler
 
 # qx compile --------------------------
 
@@ -25,13 +26,18 @@ source-output:
 .PHONY: compile-dev
 compile-dev: qx_packages source-output ## qx compiles host' 'source' -> host's 'source-output'. Use 'make compile-dev flags=--watch' for continuous compilation.
 	# qx compile 'source' $(flags) --> 'source-output' [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]
-	$(docker_compose) run --detach --rm qooxdoo-kit \
+	$(docker_compose) run --detach --rm --name=$(container_name) qooxdoo-kit \
 		qx compile $(flags) \
 			--set-env osparc.vcsRef="${VCS_REF}" \
 			--set-env osparc.vcsRefClient="${VCS_REF_CLIENT}" \
 			--set-env osparc.vcsStatusClient="${VCS_STATUS_CLIENT}" \
 			--set-env osparc.vcsOriginUrl="${VCS_URL}"
 
+.PHONY: follow-dev-logs
+follow-dev-logs: ## follow the logs of the qx compiler
+	@docker logs --follow $(container_name)
+
+
 .PHONY: compile touch upgrade
 compile compile-x: ## qx compiles host' 'source' -> image's 'build-output'
 	# qx compile 'source' within $(docker_image) image  [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]