Merge pull request #16 from odeimaiz/pcrespov-is90/dockerfile-user

fixes webserver dockerfile

* fixes healthcheck call
* webclient service does not restart now
* added rabbit dependencies to web server

services/docker-compose.yml

@@ -74,6 +74,7 @@ services:
   #--------------------------------------------------------------------
   webclient:
     image: services_webclient:build
+    restart: on-failure
     build:
       context: ./web/client/
       dockerfile: Dockerfile
@@ -91,7 +92,9 @@ services:
         - VCS_REF=${VCS_REF}
         - VCS_REF_CLIENT=${VCS_REF_CLIENT}
         - VCS_STATUS_CLIENT=${VCS_STATUS_CLIENT}
-    command: /bin/bash -c "echo 'built with qx' && cat build-output/version.txt"
+    command: >
+      /bin/sh -c "ls -l build-output;cat build-output/version.txt"
+
   webserver:
     image: ${DOCKER_IMAGE_PREFIX}webserver:${DOCKER_IMAGE_TAG}
     build:
@@ -136,10 +139,10 @@ services:
     stdin_open: true
     tty: true
     depends_on:
-      - webclient
       - apihub
       - postgres
       - minio
+      - rabbit
     deploy:
       placement:
         constraints:

services/web/Dockerfile

@@ -117,7 +117,7 @@ HEALTHCHECK --interval=30s \
             --timeout=120s \
             --start-period=30s \
             --retries=3 \
-            CMD ["python3", "$HOME/services/web/server/docker/healthcheck.py", "http://localhost:8080"]
+            CMD ["python3", "/home/scu/services/web/server/docker/healthcheck.py", "http://localhost:8080/v0/"]
 
 ENTRYPOINT [ "/bin/sh", "services/web/server/docker/entrypoint.sh" ]
 CMD ["/bin/sh", "services/web/server/docker/boot.sh"]

services/web/client/Makefile

@@ -37,6 +37,7 @@ build:
 .PHONY: clean
 # target: clean: – Cleans images and current dir outputs
 clean:
+	@docker-compose down
 	@docker image rm -f client_qx:build 2> /dev/null
 	@docker image rm -f client_qx:development 2> /dev/null
 	@git clean -dxf ${CURDIR}