Skip to content
GitLab
Commit 2a15cb2e authored by Erik's avatar Erik
Browse files

added: consul fixes

parent 9b344c40
Hide whitespace changes
Inline Side-by-side
helm/templates/adminsvc.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-adminsvc
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-adminsvc:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-adminsvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
helm/templates/apigw.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-apigw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-apigw:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-apigw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
helm/templates/consul.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-consul
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-consul:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-consul:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
helm/templates/delivery.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-deliverygw
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverygw:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverygw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
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 "600339baa94083a79852665ec63b97f8" }}
image: {{if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-deliverysvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
helm/templates/elk.yml
View file @ 2a15cb2e
......@@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: i3dhub-elastic
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-elastic:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-elastic:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
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 "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-kibana:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5601
......
helm/templates/entrygw.yml
View file @ 2a15cb2e
......@@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: i3dhub-entrygw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-entrygw:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-entrygw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
helm/templates/postgres.yml
View file @ 2a15cb2e
......@@ -28,7 +28,7 @@ spec:
spec:
containers:
- name: i3dhub-postgres
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-postgres:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-postgres:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5432 #TODO
......
helm/templates/rabbitmq.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-rabbitmq
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-rabbitmq:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-rabbitmq:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 5672 #Fixed
......
helm/templates/resourcegw.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-resourcegw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-resourcegw:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-resourcegw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
ports:
- containerPort: 80
......
helm/templates/sharedsession.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-sharedsessiongw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessiongw:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessiongw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
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 "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-sharedsessionsvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
helm/templates/transcoder.yml
View file @ 2a15cb2e
......@@ -13,7 +13,7 @@ spec:
spec:
containers:
- name: i3dhub-transcodergw
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodergw:{{ .Values.imageTag | default "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodergw:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
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 "600339baa94083a79852665ec63b97f8" }}
image: {{ if .Values.registry }}{{ .Values.registry }}/{{ end }}i3dhub-transcodersvc:{{ .Values.imageTag | default "6b431a9fdbe974c377b7833c673350cc" }}
imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }}
env:
- name: ELASTICSEARCH_HOSTS
......
helm/values.yaml
View file @ 2a15cb2e
......@@ -36,7 +36,7 @@ licenseServer: # f.e. license.threedy.io:8200
############################################################################################################################
# This is the version name and the tag for the instant3Dhub images
#imageTag: 600339baa94083a79852665ec63b97f8
#imageTag: 6b431a9fdbe974c377b7833c673350cc
rabbitmq:
cookie: SWQOKODSQALRPCLNMEQG
......
reference/transfer_images.sh
View file @ 2a15cb2e
......@@ -2,9 +2,6 @@
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
source ../version
I3DHUB_IMAGES=(
......@@ -32,7 +29,7 @@ i3dhub-transcodersvc
for IMAGE_NAME in ${I3DHUB_IMAGES[@]}
do
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}
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
version
View file @ 2a15cb2e
#Sat Nov 21 00:00:46 CET 2020
#Mon Nov 23 14:04:18 CET 2020
export VERSION_NAME=3.0-dev2
export IMAGE_TAG=600339baa94083a79852665ec63b97f8
export WEBVIS_HASH=a521d31398df05711666ee42f013047aae655112
export IMAGE_TAG=6b431a9fdbe974c377b7833c673350cc
export WEBVIS_HASH=f8bb958baa1361a2589a3b4581a08da383220c0c
export WEBVIS_REF=master
export WEBVIS_TAG=2c05a24002814b6998948fe6097288cc
export GENERATORS_HASH=cb1f98a4e0113cfca639635f471d9d805fd13f74
export WEBVIS_TAG=5073d68fd90c72170791557c46b3e23b
export GENERATORS_HASH=e385564c1b11bd6e6044f8943114b384d9da2d29
export GENERATORS_REF=master
export GENERATORS_TAG=6e6685fda55bde957d000aff0a092f76
export MICROSERVICES_HASH=6b09a0ca2c8e56ca6bfc203b8bc9b05627137bee
export GENERATORS_TAG=cbe6cd856f77895c1c2887ed46bea0a8
export MICROSERVICES_HASH=4fd50aa62c984052b064dced84186082f37f0456
export MICROSERVICES_REF=master
export MICROSERVICES_TAG=39b2d8fe867ea48e923197ca6b859208
export MICROSERVICES_TAG=5a75ea79e299026f6b432a37daf5dc5e
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=8f095e646b8e27b00776aa2e9269f62c06342a34
export DEPLOY_HASH=c53dd1032455477a991bd0e425056cfad42907df
export DEPLOY_REF=master
export DEPLOY_TAG=600339baa94083a79852665ec63b97f8
export DEPLOY_TAG=6b431a9fdbe974c377b7833c673350cc
export CPACK_HASH=97f9218fcfafa26dac72ce349fd4544aba225692
export CPACK_REF=master
export CPACK_TAG=8ed5c7ab99987984b4e0d61696614f05
export CPACK_TAG=663cc47b2ee985a5e933ec9d55257741
export SESSIONHANDLER_HASH=f9477a1bc8f3399646b14f4e8fc80d60d0ff59d2
export SESSIONHANDLER_REF=master
export SESSIONHANDLER_TAG=1a124a6c6ebeb53c97739f34f1497767
export CHANGELOG_HASH=416f4e1fb5753cc8ab3e750d1bac1e7af744c6c5
export CHANGELOG_HASH=fad57eefd4a2d04b3379207c5c93045aa89ac47e
export CHANGELOG_REF=master
export CHANGELOG_TAG=0fe5b0461c0caae9a7ecf14bafc8c748
export CHANGELOG_TAG=69988a30ccb3c945bff85276d4c01ae6
export DOCINTEGRATION_HASH=5e5d5b853e27c95d1631810ef7254e53bc5fdfac
export DOCINTEGRATION_REF=master
export DOCINTEGRATION_TAG=0f791814432921e09fb4928069b537a8
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