last touches

Author: odeimaiz

services/static-webserver/client/Makefile

@@ -35,7 +35,7 @@ compile-dev: qx_packages source-output ## qx compiles host' 'source' -> host's '
 			--set-env osparc.vcsRefClient="${VCS_REF_CLIENT}" \
 			--set-env osparc.vcsStatusClient="${VCS_STATUS_CLIENT}" \
 			--set-env osparc.vcsOriginUrl="${VCS_URL}"
-	python ./scripts/post-compile.py ${VCS_REF_CLIENT}
+	python ./scripts/post-compile.py
 
 .PHONY: follow-dev-logs
 follow-dev-logs: ## follow the logs of the qx compiler
@@ -53,7 +53,7 @@ compile: ## qx compiles host' 'source' -> image's 'build-output'
 		--build-arg VCS_STATUS_CLIENT=${VCS_STATUS_CLIENT} \
 		--build-arg VCS_URL=${VCS_URL} \
 		--target=build-client .
-	python ./scripts/post-compile.py ${VCS_REF_CLIENT}
+	python ./scripts/post-compile.py
 
 touch: ## minimal image build with /project/output-build inside
 	# touch /project/output-build such that multi-stage 'services/web/Dockerfile' can build development target (fixes #1097)

services/static-webserver/client/scripts/post-compile.py

@@ -1,7 +1,6 @@
 import json
 import os
 import random
-import sys
 
 output_folders = [
     "source-output",  # dev output
@@ -54,9 +53,6 @@ def _get_output_file_paths(filename):
 
 
 def add_no_cache_param(vcs_ref_client):
-    if not vcs_ref_client:
-        vcs_ref_client = str(random.random())
-
     index_file_paths = _get_output_file_paths("index.html")
     for index_file_path in index_file_paths:
         if not os.path.isfile(index_file_path):
@@ -82,7 +78,5 @@ def add_no_cache_param(vcs_ref_client):
 
 if __name__ == "__main__":
     update_apps_metadata()
-    vcs_ref_client = None
-    if len(sys.argv) > 1:
-        vcs_ref_client = sys.argv[1]
+    vcs_ref_client = os.getenv("VCS_REF_CLIENT", str(random.random()))
     add_no_cache_param(vcs_ref_client)