Commit 8d8b82a4 authored by threedytech's avatar threedytech
Browse files

release: 3.2.1

parent 6b695d0c
############################################
instant3Dhub 3.2 Integration
instant3Dhub 3.2.1 Integration
############################################
This is the deployment repository for instant3Dhub. For more information about the product visit `www.threedy.io <https://www.threedy.io>`_.
......
......@@ -6,6 +6,7 @@ CONSUL_HOSTNAME=i3dhub-consul
KEYSTORE_HOSTNAME=i3dhub-keystore
ELASTIC_HOSTNAME=i3dhub-elastic
POSTGRES_HOSTNAME=i3dhub-postgres
RABBITMQ_HOSTNAME=i3dhub-rabbitmq
JAEGER_COLLECTOR_HOSTNAME=i3dhub-jaeger-collector
JAEGER_QUERY_HOSTNAME=i3dhub-jaeger-query
......@@ -34,4 +35,8 @@ RENDERER_BASE_PORT=${RENDERER_BASE_PORT}
JAEGER_COLLECTOR_PORT=14250
JAEGER_QUERY_PORT=16686
POSTGRES_CONNECTION_STRING=postgresql://i3dhub:12and3@i3dhub-postgres:5432/instant3Dhub?sslmode=disable
POSTGRES_SPACE_CONNECTION_STRING=postgresql://i3dhub:12and3@i3dhub-postgres:5432/instant3Dhub?sslmode=disable
RABBIT_CONNECTION_STRING=amqp://guest:guest@i3dhub-rabbitmq:5672
I3DH_LOG_LEVEL=trace
......@@ -6,3 +6,5 @@ ELASTICSEARCH_HOSTS="http://i3dhub-elastic:9200"
ES_SERVER_URLS=http://i3dhub-elastic:9200
#jaeger collector host
JAEGER_COLLECTOR_HOSTS=i3dhub-jaeger-collector:14250
#ELK_ENABLED=true
......@@ -9,7 +9,7 @@ volumes:
services:
i3dhub-consul:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-consul:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-consul:e8717e21086b5da88fb2978e6c8717d3
environment:
CONSUL_PORT: "8500"
CONSUL_CONTENT_PATH: /consul/ui/
......@@ -25,7 +25,7 @@ services:
restart: unless-stopped
i3dhub-apigw:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-apigw:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-apigw:e8717e21086b5da88fb2978e6c8717d3
ports:
- "${HUB_NODE_PORT}:8080"
env_file:
......@@ -35,7 +35,7 @@ services:
restart: unless-stopped
i3dhub-adminsvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-adminsvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-adminsvc:e8717e21086b5da88fb2978e6c8717d3
volumes:
- rabbitmq_volume:/var/lib/rabbitmq
- elastic_volume:/usr/share/elasticsearch/data
......@@ -50,7 +50,7 @@ services:
restart: unless-stopped
i3dhub-keystore:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-keystore:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-keystore:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env.elastic
- .env
......@@ -60,7 +60,7 @@ services:
restart: unless-stopped
i3dhub-authsvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-authsvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-authsvc:e8717e21086b5da88fb2978e6c8717d3
volumes:
- cache_volume:/var/cache/instant3Dhub/
env_file:
......@@ -70,32 +70,8 @@ services:
- i3dhub-postgres
restart: unless-stopped
i3dhub-jaeger-collector:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-jaeger-collector:c0552c477c6750053ab1152a6780f4e2
environment:
SPAN_STORAGE_TYPE: "elasticsearch"
ENABLE_TRACING: "true"
hostname: i3dhub-jaeger-collector
env_file:
- .env.elastic
depends_on:
- i3dhub-elastic
restart: unless-stopped
i3dhub-jaeger-query:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-jaeger-query:c0552c477c6750053ab1152a6780f4e2
environment:
SPAN_STORAGE_TYPE: "elasticsearch"
QUERY_BASE_PATH: /jaeger
hostname: i3dhub-jaeger-query
env_file:
- .env.elastic
depends_on:
- i3dhub-elastic
restart: unless-stopped
i3dhub-rabbitmq:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-rabbitmq:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-rabbitmq:e8717e21086b5da88fb2978e6c8717d3
environment:
RABBITMQ_ERLANG_COOKIE: "SWQOKODSQALRPCLNMEQG"
RABBITMQ_DEFAULT_USER: "guest"
......@@ -118,7 +94,7 @@ services:
restart: unless-stopped
i3dhub-postgres:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-postgres:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-postgres:e8717e21086b5da88fb2978e6c8717d3
environment:
POSTGRES_USER: i3dhub
POSTGRES_PASSWORD: 12and3
......@@ -136,64 +112,41 @@ services:
- .env.elastic
restart: unless-stopped
i3dhub-elastic:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-elastic:c0552c477c6750053ab1152a6780f4e2
environment:
- discovery.type=single-node
healthcheck:
# wait for port to be open before marking as healthy
test: [ "CMD", "nc", "-z", "localhost", "9200" ]
timeout: 10s
retries: 2
volumes:
- elastic_volume:/usr/share/elasticsearch/data
restart: unless-stopped
i3dhub-kibana:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-kibana:c0552c477c6750053ab1152a6780f4e2
environment:
SERVER_BASEPATH: /kibana
env_file:
- .env.elastic
depends_on:
- i3dhub-elastic
restart: unless-stopped
i3dhub-resourcegw:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-resourcegw:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-resourcegw:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env.elastic
- .env
depends_on:
- i3dhub-rabbitmq
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-entrygw:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-entrygw:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-entrygw:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env.elastic
- .env
depends_on:
- i3dhub-rabbitmq
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
volumes:
- entrygw_volume:/opt/instant3Dhub/share/instant3Dhub/services/hubgw/
restart: unless-stopped
i3dhub-spacesvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-spacesvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-spacesvc:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env.elastic
- .env
depends_on:
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-transcodersvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-transcodersvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-transcodersvc:e8717e21086b5da88fb2978e6c8717d3
volumes:
- cache_volume:/var/cache/instant3Dhub/
env_file:
......@@ -202,11 +155,11 @@ services:
depends_on:
- i3dhub-rabbitmq
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-measurementsvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-measurementsvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-measurementsvc:e8717e21086b5da88fb2978e6c8717d3
volumes:
- cache_volume:/var/cache/instant3Dhub/
env_file:
......@@ -215,11 +168,11 @@ services:
depends_on:
- i3dhub-rabbitmq
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-deliverysvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-deliverysvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-deliverysvc:e8717e21086b5da88fb2978e6c8717d3
volumes:
- cache_volume:/var/cache/instant3Dhub/
env_file:
......@@ -227,11 +180,11 @@ services:
- .env.elastic
depends_on:
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-sharedsessionsvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-sharedsessionsvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-sharedsessionsvc:e8717e21086b5da88fb2978e6c8717d3
volumes:
- cache_volume:/var/cache/instant3Dhub/
env_file:
......@@ -240,31 +193,31 @@ services:
depends_on:
- i3dhub-rabbitmq
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-spacestoresvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-spacestoresvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-spacestoresvc:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env
- .env.elastic
depends_on:
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-querysvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-querysvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-querysvc:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env
- .env.elastic
depends_on:
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
i3dhub-uploadsvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-uploadsvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-uploadsvc:e8717e21086b5da88fb2978e6c8717d3
env_file:
- .env
volumes:
......
version: '3.7'
volumes:
elastic_volume:
services:
i3dhub-elastic:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-elastic:e8717e21086b5da88fb2978e6c8717d3
environment:
- discovery.type=single-node
healthcheck:
# wait for port to be open before marking as healthy
test: [ "CMD", "nc", "-z", "localhost", "9200" ]
timeout: 10s
retries: 2
volumes:
- elastic_volume:/usr/share/elasticsearch/data
restart: unless-stopped
i3dhub-kibana:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-kibana:e8717e21086b5da88fb2978e6c8717d3
environment:
SERVER_BASEPATH: /kibana
env_file:
- .env.elastic
depends_on:
- i3dhub-elastic
restart: unless-stopped
......@@ -5,7 +5,7 @@ volumes:
services:
i3dhub-gpuvissvc:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-gpuvissvc:c0552c477c6750053ab1152a6780f4e2
image: ${IMAGE_REGISTRY_HOST}/i3dhub-gpuvissvc:e8717e21086b5da88fb2978e6c8717d3
runtime: nvidia
deploy:
resources:
......@@ -23,6 +23,6 @@ services:
- i3dhub-consul
- i3dhub-rabbitmq
- i3dhub-postgres
- i3dhub-elastic
- ${ELK_DEP}
restart: unless-stopped
version: '3.7'
services:
i3dhub-jaeger-collector:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-jaeger-collector:e8717e21086b5da88fb2978e6c8717d3
environment:
SPAN_STORAGE_TYPE: "elasticsearch"
ENABLE_TRACING: "true"
hostname: i3dhub-jaeger-collector
env_file:
- .env.elastic
depends_on:
- i3dhub-elastic
restart: unless-stopped
i3dhub-jaeger-query:
image: ${IMAGE_REGISTRY_HOST}/i3dhub-jaeger-query:e8717e21086b5da88fb2978e6c8717d3
environment:
SPAN_STORAGE_TYPE: "elasticsearch"
QUERY_BASE_PATH: /jaeger
hostname: i3dhub-jaeger-query
env_file:
- .env.elastic
depends_on:
- i3dhub-elastic
restart: unless-stopped
\ No newline at end of file
{{- $elkContext := .Values.elasticStackFeatures | default dict -}}
{{- $maintenance := .Values.maintenance | default dict -}}
{{- $maintenanceSys := $maintenance.system | default dict -}}
{{- $maintenanceSysExpire := $maintenanceSys.expireUnusedAge | default "0s" -}}
address: 0.0.0.0:8080
resource-gw: http://i3dhub-resourcegw:8080/resource-gateway-resource
entrygw-path: /opt/instant3Dhub/share/instant3Dhub/services/hubgw/
repo-path: /opt/instant3Dhub/share/instant3Dhub/packaged/repo/
cache-path: /var/cache/instant3Dhub/
ui-path: /opt/instant3Dhub/share/instant3Dhub/admin/ui/
automatic-expiration: false
expire-duration: 336h # 2 weeks
expire-frequency: 24h
automatic-expiration: {{ not (hasPrefix "0" $maintenanceSysExpire) }}
expire-duration: {{ $maintenanceSysExpire }}
expire-frequency: 5m
other-volumes:
- /var/lib/rabbitmq/
- /usr/share/elasticsearch/data/
......
# where to listen for incoming requests, use a file location for a unix domain socket
# or an address with port (e.g. 127.0.0.1:6060) to use a tcp socket
listen-address: 127.0.0.1:6060
listen-address: 0.0.0.0:6060
# where the instant hub can be reached, necessary for triggering retranscodes if
# cache and source seem to differ
......@@ -22,15 +22,6 @@ auth:
# whether to enable the auth endpoints
enabled: {{ .Values.enableCacheAuthCheck | default "true" }}
# the postgres instance where instant3Dhub tables can be found
postgres:
host: {{ if .Values.postgres }}{{ .Values.postgres.host | default "i3dhub-postgres" }}{{ else }}i3dhub-postgres{{ end }}
port: {{ if .Values.postgres }}{{ .Values.postgres.port | default "5432" }}{{ else }}5432{{ end }}
dbname: {{ if .Values.postgres }}{{ .Values.postgres.i3dh_db | default "instant3Dhub" }}{{ else }}instant3Dhub{{ end }}
user: {{ if .Values.postgres }}{{ .Values.postgres.i3dh_db | default "i3dhub" }}{{ else }}i3dhub{{ end }}
password: {{ if .Values.postgres }}{{ .Values.postgres.i3dh_db | default "12and3" }}{{ else }}12and3{{ end }}
sslmode: disable
# open id configuration for enabling authorization caching
openid:
# the provider endpoint
......
......@@ -18,12 +18,6 @@ log-folder: /var/log/instant3Dhub
# postgres connection parameters. only used internally in the cluster
postgres:
host: {{ if .Values.postgres }}{{ .Values.postgres.host | default "i3dhub-postgres" }}{{ else }}i3dhub-postgres{{ end }}
port: {{ if .Values.postgres }}{{ .Values.postgres.port | default "5432" }}{{ else }}5432{{ end }}
dbname: {{ if .Values.postgres }}{{ .Values.postgres.db_i3dh | default "instant3Dhub" }}{{ else }}instant3Dhub{{ end }}
user: {{ if .Values.postgres }}{{ .Values.postgres.user | default "i3dhub" }}{{ else }}i3dhub{{ end }}
password: {{ if .Values.postgres }}{{ .Values.postgres.password | default "12and3" }}{{ else }}12and3{{ end }}
sslmode: {{ if .Values.postgres }}{{ .Values.postgres.sslmode | default "disable" }}{{ else }}disable{{ end }}
max-open-conns: 10
max-idle-conns: 10
max-conn-lifetime: 5m
......@@ -36,19 +30,10 @@ resource-gateway-port: 8080
key-store-address: http://i3dhub-keystore:8080
# internal address of the local sidecar auth service
auth-address: http://127.0.0.1:6060
# connection string to use when connecting to rabbitmq. only used internally in the cluster
rabbit-connection-string: amqp://{{ if .Values.rabbitmq }}{{ .Values.rabbitmq.user | default "guest" }}{{ else }}guest{{ end }}:{{ if .Values.rabbitmq }}{{ .Values.rabbitmq.password | default "guest" }}{{ else }}guest{{ end }}@i3dhub-rabbitmq:5672
auth-address: http://i3dhub-authsvc:6060
# custom configuration values which may be accessed in dynamic templates by services
custom-values:
l3d-db-host: {{ if .Values.postgres }}{{ .Values.postgres.host | default "i3dhub-postgres" }}{{ else }}i3dhub-postgres{{ end }}
l3d-db-port: {{ if .Values.postgres }}{{ .Values.postgres.port | default "5432" }}{{ else }}5432{{ end }}
l3d-db-name: {{ if .Values.postgres }}{{ .Values.postgres.db_i3dh | default "instant3Dhub" }}{{ else }}instant3Dhub{{ end }}
l3d-db-user: {{ if .Values.postgres }}{{ .Values.postgres.user | default "i3dhub" }}{{ else }}i3dhub{{ end }}
l3d-db-password: {{ if .Values.postgres }}{{ .Values.postgres.password | default "12and3" }}{{ else }}12and3{{ end }}
l3d-db-sslmode: {{ if .Values.postgres }}{{ .Values.postgres.sslmode | default "disable" }}{{ else }}disable{{ end }}
auth-header-rules:
{{- if .Values.authHeaderNames -}}
......@@ -61,9 +46,12 @@ custom-values:
{{- end }}
ping:
{{- $pingInterval := .Values.pingInterval | default "20s" -}}
{{- if eq $pingInterval "0s" }}
{{- $pingInterval := 20 -}}
{{- if kindIs "float64" .Values.pingInterval }}
{{- $pingInterval = .Values.pingInterval | int -}}
{{- end }}
{{- if eq $pingInterval 0 }}
enabled: false
{{- else }}
interval: {{ $pingInterval }}
interval: {{ $pingInterval }}s
{{- end -}}
......@@ -21,6 +21,11 @@
#
# .Params.* -- The resource request parameters themselves.
{{- $pingInterval := 20 -}}
{{- if kindIs "float64" .Values.pingInterval }}
{{- $pingInterval = .Values.pingInterval | int -}}
{{- end }}
service:
name: SharedSessionService
bin-dir: {{"{{"}} package_dir {{"}}"}}/opt/nodejs/bin
......@@ -99,5 +104,5 @@ service:
--spaceId [[ .Params.sessionId | shell_escape ]]
--relativeHostedUris
--webVisLogLevel "TRACE"
--pingInterval 30000
--pingInterval {{ mul $pingInterval 1000 }}
--random-path [[ .RESOURCE_ID ]]
{{- $maintenance := .Values.maintenance | default dict -}}
{{- $maintenanceSpace := $maintenance.spaces | default dict -}}
{{- $maintenanceSpaceExpire := $maintenanceSpace.expireUnusedAge | default "336h" -}}
baseoptions:
# listen address
address: "0.0.0.0:8080"
......@@ -8,7 +12,7 @@ sessionlisting: false
# maximum duration to keep a session, set to 0 to disable deletion
# example: 336h
# example: 5h30m25s
lifetime: 336h
lifetime: {{ $maintenanceSpaceExpire }}
# whether to expect a random path before endpoints (required)
with-random-path-prefix: true
......@@ -16,59 +20,3 @@ with-random-path-prefix: true
storageoptions:
# type of storage to be used (sqlite, postgresql)
type: "postgresql"
# The connection information to connect to the database
dbConnectionString: >
host={{ if .Values.postgres -}}
{{- if .Values.postgres.host_sstore -}}
{{- .Values.postgres.host_sstore -}}
{{- else -}}
{{- .Values.postgres.host | default "i3dhub-postgres" -}}
{{- end -}}
{{- else -}}
i3dhub-postgres
{{- end }}
port={{ if .Values.postgres -}}
{{- if .Values.postgres.port_sstore -}}
{{- .Values.postgres.port_sstore -}}
{{- else -}}
{{- .Values.postgres.port | default 5432 -}}
{{- end -}}
{{- else -}}
5432
{{- end }}
user={{ if .Values.postgres -}}
{{- if .Values.postgres.user_sstore -}}
{{- .Values.postgres.user_sstore -}}
{{- else -}}
{{- .Values.postgres.user | default "i3dhub" -}}
{{- end -}}
{{- else -}}
i3dhub
{{- end }}
password={{ if .Values.postgres -}}
{{- if .Values.postgres.password_sstore -}}
{{- .Values.postgres.password_sstore -}}
{{- else -}}
{{- .Values.postgres.password | default "12and3" -}}
{{- end -}}
{{- else -}}
12and3
{{- end }}
dbname={{ if .Values.postgres -}}
{{- if .Values.postgres.db_sstore -}}
{{- .Values.postgres.db_sstore -}}
{{- else -}}
{{- .Values.postgres.db_i3dh | default "instant3Dhub" -}}
{{- end -}}
{{- else -}}
instant3Dhub
{{- end }}
sslmode={{ if .Values.postgres -}}
{{- if .Values.postgres.sslmode_sstore -}}
{{- .Values.postgres.sslmode_sstore -}}
{{- else -}}
{{- .Values.postgres.sslmode | default "disable" -}}
{{- end -}}
{{- else -}}
disable
{{- end }}
......@@ -62,6 +62,7 @@ service:
--rest_baseurl http://[[ hostname ]]:[[ index .RUNTIME_WORKER_PORTS 0 ]]
--ws_port [[ index .RUNTIME_WORKER_PORTS 1 ]]
--ws_baseurl ws://[[ hostname ]]:[[ index .RUNTIME_WORKER_PORTS 1 ]]
--ws_ping_interval {{ .Values.pingInterval | default 20 }}
--instant-hub http://i3dhub-entrygw:8080
--default-ogl-view OpenGLTrackView
--rle-invert false
......
......@@ -250,48 +250,48 @@ service:
patterns:
{{"{{"}}- $defaultL3dGen := dict "3dsmax" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "3mf" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "acis" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "blender" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "catiav4" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "catiav5" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "catiav6" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "collada-dae" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "creoview" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "dx" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "dxf" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "fbx" (list "Core/l3dGen" "Core/l3dGen|Loader/FBX") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "fhs" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "glb" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "gltf" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "ifc" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "ifc" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "iges" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "inventor" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "kbl" (list "Core/l3dGen" "Core/l3dGen|Loader/KBL") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "las" (list "Core/l3dGen" "Core/l3dGen|Loader/LAS") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "nx" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "obj" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "off" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "openjt" (list "Core/l3dGen" "Core/l3dGen|Loader/OpenJT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "opensg" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "parasolid" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "plmxml" (list "Core/l3dGen" "Core/l3dGen|Loader/PLMXML") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "ply" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "pro-eng" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "revit" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "rhino" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "rvm" (list "Core/l3dGen" "Core/l3dGen|Loader/PMUC") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "solidedge" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "solidworks-assembly" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "solidworks-part" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "step203" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "step214" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "step242" (list "Core/l3dGen" "Core/l3dGen|Loader/STEP242XML") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "stl" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "wrl" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "x3d-xml" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "x3d-fastinfoset" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "x3d-vrml" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "x3d-xml" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "xyz" (list "Core/l3dGen") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "catiav4" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "catiav5" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "catiav6" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "ifc" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "creoview" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "nx" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "solidworks-part" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "solidworks-assembly" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "solidedge" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "inventor" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "revit" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "pro-eng" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "acis" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}}- $_ := set $defaultL3dGen "rhino" (list "Core/l3dGen" "Core/l3dGen|Loader/DATAKIT") -{{"}}"}}
{{"{{"}} define "l3dGenCmdLine" {{"}}"}}
l3dGen -i [[ shell_escape .Params.resolvedUri ]]
......@@ -343,8 +343,9 @@ service:
exitCodes: l3dGen
descriptor: l3dGen
env:
PGHOST: '[[ index .Custom "l3d-db-host" ]]'
PGPORT: '[[ index .Custom "l3d-db-port" ]]'
# for libpq
PGHOST: '[[ (urlParse (env "POSTGRES_CONNECTION_STRING")).hostname ]]'
PGPORT: '[[ (split ":" (urlParse (env "POSTGRES_CONNECTION_STRING")).host)._1 ]]'
cmds:
- >
{{"{{"}} template "l3dGenCmdLine" {{"}}"}}
......@@ -372,8 +373,9 @@ service:
exitCodes: l3dGen
descriptor: l3dGen
env:
PGHOST: '[[ index .Custom "l3d-db-host" ]]'
PGPORT: '[[ index .Custom "l3d-db-port" ]]'