Commit 41392c89 authored by Erik's avatar Erik
Browse files

fixed: webvis default layer behavior

parent 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-adminsvc
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-adminsvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-adminsvc:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-apigw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-apigw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-apigw:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-consul
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-consul:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-consul:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-deliverygw
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverygw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverygw:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -39,7 +39,7 @@ spec:
spec:
containers:
- name: i3dhub-deliverysvc
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverysvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverysvc:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
......@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: i3dhub-elastic
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-elastic:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-elastic:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 9200 #TODO
......@@ -65,7 +65,7 @@ spec:
spec:
containers:
- name: i3dhub-kibana
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-kibana:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-kibana:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5601
......
......@@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: i3dhub-entrygw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-entrygw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-entrygw:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
......@@ -28,7 +28,7 @@ spec:
spec:
containers:
- name: i3dhub-postgres
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-postgres:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-postgres:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5432 #TODO
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-rabbitmq
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-rabbitmq:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-rabbitmq:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5672 #Fixed
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-resourcegw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-resourcegw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-resourcegw:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-sharedsessiongw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessiongw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessiongw:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -39,7 +39,7 @@ spec:
spec:
containers:
- name: i3dhub-sharedsessionsvc
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessionsvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessionsvc:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-transcodergw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodergw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodergw:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......@@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: i3dhub-transcodersvc
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodersvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodersvc:{{ .Values.imageTag | default "d20142932da4f8cb3b7d816138fb24d2" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
......@@ -36,7 +36,7 @@ licenseServer: # f.e. license.threedy.io:8200
############################################################################################################################
# This is the version name and the tag for the instant3Dhub images
#imageTag: 6b431a9fdbe974c377b7833c673350cc
#imageTag: d20142932da4f8cb3b7d816138fb24d2
rabbitmq:
cookie: SWQOKODSQALRPCLNMEQG
......
......@@ -2,6 +2,14 @@
if [ -z $1 ] || [ -z $2 ]; then echo "Usage: ./transfer_images SOURCE_REPO TARGET_REPO" && exit 1; fi
SOURCE_IMAGE_REGISTRY_HOST=$1
TARGET_IMAGE_REGISTRY_HOST=$2
echo "using source image repository: ${SOURCE_IMAGE_REGISTRY_HOST}"
echo "using target image repository: ${TARGET_IMAGE_REGISTRY_HOST}"
source ../version
I3DHUB_IMAGES=(
......@@ -12,8 +20,8 @@ i3dhub-deliverygw
i3dhub-deliverysvc
i3dhub-elastic
i3dhub-entrygw
i3dhub-jaeger
i3dhub-jaeger
i3dhub-jaeger-collector
i3dhub-jaeger-query
i3dhub-kibana
i3dhub-measurementgw
i3dhub-measurementsvc
......@@ -32,4 +40,4 @@ echo $IMAGE_NAME;
docker pull ${SOURCE_IMAGE_REGISTRY_HOST}${IMAGE_NAME}:${IMAGE_TAG}
docker image tag ${SOURCE_IMAGE_REGISTRY_HOST}${IMAGE_NAME}:${IMAGE_TAG} ${TARGET_IMAGE_REGISTRY_HOST}${IMAGE_NAME}:${IMAGE_TAG}
docker push ${TARGET_IMAGE_REGISTRY_HOST}${IMAGE_NAME}:${IMAGE_TAG}
done
\ No newline at end of file
done
#Mon Nov 23 14:04:18 CET 2020
#Mon Nov 23 18:51:54 CET 2020
export VERSION_NAME=3.0-dev2
export IMAGE_TAG=6b431a9fdbe974c377b7833c673350cc
export WEBVIS_HASH=f8bb958baa1361a2589a3b4581a08da383220c0c
export IMAGE_TAG=d20142932da4f8cb3b7d816138fb24d2
export WEBVIS_HASH=0b97dd0eaf242bf15b4eb516023db8901f38889b
export WEBVIS_REF=master
export WEBVIS_TAG=5073d68fd90c72170791557c46b3e23b
export WEBVIS_TAG=e9f0023a3fb2c113845a279cdc9aedba
export GENERATORS_HASH=e385564c1b11bd6e6044f8943114b384d9da2d29
export GENERATORS_REF=master
export GENERATORS_TAG=cbe6cd856f77895c1c2887ed46bea0a8
export MICROSERVICES_HASH=4fd50aa62c984052b064dced84186082f37f0456
export MICROSERVICES_HASH=12285661c42ed64732cbab37bbb024692449b0c0
export MICROSERVICES_REF=master
export MICROSERVICES_TAG=5a75ea79e299026f6b432a37daf5dc5e
export MICROSERVICES_TAG=8791e62c96d4591701cbe1c6805a885f
export EXTERNALLIBRARIES_HASH=cd253dd5372e7931dbd6c6cca22f1ec242b88e3d
export EXTERNALLIBRARIES_REF=master
export EXTERNALLIBRARIES_TAG=c38cfdd5ac4b01437a9de408c6f4d116
export INTERNALEXTLIBS_HASH=af1dd4133ff0fece3ef8d54dba70d98f66f599f1
export INTERNALEXTLIBS_REF=master
export INTERNALEXTLIBS_TAG=1fb33ec4301189399162345ee3d1238f
export DEPLOY_HASH=c53dd1032455477a991bd0e425056cfad42907df
export DEPLOY_HASH=325aba98fe5120f5119f590e83640d4b8971de00
export DEPLOY_REF=master
export DEPLOY_TAG=6b431a9fdbe974c377b7833c673350cc
export DEPLOY_TAG=d20142932da4f8cb3b7d816138fb24d2
export CPACK_HASH=97f9218fcfafa26dac72ce349fd4544aba225692
export CPACK_REF=master
export CPACK_TAG=663cc47b2ee985a5e933ec9d55257741
export CPACK_TAG=872e34f1c0e15e01d25bf2c941992ab6
export SESSIONHANDLER_HASH=f9477a1bc8f3399646b14f4e8fc80d60d0ff59d2
export SESSIONHANDLER_REF=master
export SESSIONHANDLER_TAG=1a124a6c6ebeb53c97739f34f1497767
export CHANGELOG_HASH=fad57eefd4a2d04b3379207c5c93045aa89ac47e
export CHANGELOG_REF=master
export CHANGELOG_TAG=69988a30ccb3c945bff85276d4c01ae6
export DOCINTEGRATION_HASH=5e5d5b853e27c95d1631810ef7254e53bc5fdfac
export DOCINTEGRATION_HASH=de7c9783c8371c614f675ad8c5c2aa13de9f1235
export DOCINTEGRATION_REF=master
export DOCINTEGRATION_TAG=0f791814432921e09fb4928069b537a8
export DOCINTEGRATION_TAG=1ac08d702972dc65d3cd2c09c7a06bfd
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment