Add IsolatedVMHostname to EnvironmentConfig.ts and docker-compose files

This commit is contained in:
Simon Larsen 2024-04-05 20:02:33 +01:00
parent e35dba93ce
commit 78e9ad439c
No known key found for this signature in database
GPG key ID: AB45983AA9C81CDE
4 changed files with 40 additions and 0 deletions

View file

@ -79,6 +79,12 @@ export const IngestorHostname: Hostname = Hostname.fromString(
}`
);
export const IsolatedVMHostname: Hostname = Hostname.fromString(
`${process.env['SERVER_ISOLATED_VM_HOSTNAME'] || 'localhost'}:${
process.env['ISOLATED_VM_PORT'] || 80
}`
);
export const AccountsHostname: Hostname = Hostname.fromString(
`${process.env['SERVER_ACCOUNTS_HOSTNAME'] || 'localhost'}:${
process.env['ACCOUNTS_PORT'] || 80

View file

@ -29,6 +29,8 @@
value: {{ $.Values.analytics.host }}
- name: SERVER_ACCOUNTS_HOSTNAME
value: {{ $.Release.Name }}-accounts.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_ISOLATED_VM_HOSTNAME
value: {{ $.Release.Name }}-isolated-vm.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_APP_HOSTNAME
value: {{ $.Release.Name }}-app.{{ $.Release.Namespace }}.svc.{{ $.Values.global.clusterDomain }}
- name: SERVER_INGESTOR_HOSTNAME
@ -54,6 +56,8 @@
value: {{ $.Values.port.testServer | squote }}
- name: ACCOUNTS_PORT
value: {{ $.Values.port.accounts | squote }}
- name: ISOLATED_VM_PORT
value: {{ $.Values.port.isolatedVM | squote }}
- name: STATUS_PAGE_PORT
value: {{ $.Values.port.statusPage | squote }}
- name: DASHBOARD_PORT

View file

@ -246,6 +246,30 @@ services:
network: host
context: .
dockerfile: ./Probe/Dockerfile
isolated-vm:
volumes:
- ./IsolatedVM:/usr/src/app
# Use node modules of the container and not host system.
# https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
- /usr/src/app/node_modules/
- ./Common:/usr/src/Common
- ./Model:/usr/src/Model
- ./CommonServer:/usr/src/CommonServer
- ./CommonUI:/usr/src/CommonUI
- /usr/src/Common/node_modules/
- /usr/src/CommonUI/node_modules/
- /usr/src/CommonServer/node_modules/
- /usr/src/Model/node_modules/
ports:
- '9974:9229' # Debugging port.
extends:
file: ./docker-compose.base.yml
service: isolated-vm
build:
network: host
context: .
dockerfile: ./IsolatedVM/Dockerfile
ingestor:
volumes:

View file

@ -85,6 +85,12 @@ services:
file: ./docker-compose.base.yml
service: ingestor
isolated-vm:
image: oneuptime/isolated-vm:${APP_TAG}
extends:
file: ./docker-compose.base.yml
service: isolated-vm
ingress:
image: oneuptime/nginx:${APP_TAG}
extends: