From 78e9ad439cfaa44ec7dbb7611f13ba153ce6f7e9 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Fri, 5 Apr 2024 20:02:33 +0100 Subject: [PATCH] Add IsolatedVMHostname to EnvironmentConfig.ts and docker-compose files --- CommonServer/EnvironmentConfig.ts | 6 +++++ .../Public/oneuptime/templates/_helpers.tpl | 4 ++++ docker-compose.dev.yml | 24 +++++++++++++++++++ docker-compose.yml | 6 +++++ 4 files changed, 40 insertions(+) diff --git a/CommonServer/EnvironmentConfig.ts b/CommonServer/EnvironmentConfig.ts index 545658407c..fe1e9368c9 100644 --- a/CommonServer/EnvironmentConfig.ts +++ b/CommonServer/EnvironmentConfig.ts @@ -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 diff --git a/HelmChart/Public/oneuptime/templates/_helpers.tpl b/HelmChart/Public/oneuptime/templates/_helpers.tpl index b0f5f99286..98058b2cce 100644 --- a/HelmChart/Public/oneuptime/templates/_helpers.tpl +++ b/HelmChart/Public/oneuptime/templates/_helpers.tpl @@ -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 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 7d7de53b16..aae19625f0 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -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: diff --git a/docker-compose.yml b/docker-compose.yml index cec1c64ae5..2f673d2474 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: