From dbedbd73402e61e2c4ca927e0fa5cf9c19bbc34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bj=C3=B6rklund?= Date: Fri, 6 Dec 2024 13:54:07 +0100 Subject: [PATCH] Use correct docker image for vuln-dashboard --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 +- .../etc/puppet/modules/soc/manifests/vuln_dashboard.pp | 2 +- .../soc/templates/vuln-dashboard/docker-compose.yml.erb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index bd06b67..a2b4a8e 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -27,7 +27,7 @@ soc::sso: hostname: 'vul-dashboard-test.cert.sunet.se' email: 'cert@cert.sunet.se' - service_endpoint: 'http://dashboard-local:8000' + service_endpoint: 'http://dashboard-dev:8000' x_remote_user: true groups: - 'sunet-cert' diff --git a/global/overlay/etc/puppet/modules/soc/manifests/vuln_dashboard.pp b/global/overlay/etc/puppet/modules/soc/manifests/vuln_dashboard.pp index 8837b84..8ea33cf 100644 --- a/global/overlay/etc/puppet/modules/soc/manifests/vuln_dashboard.pp +++ b/global/overlay/etc/puppet/modules/soc/manifests/vuln_dashboard.pp @@ -3,7 +3,7 @@ class soc::vuln_dashboard( String $docker_tag = 'latest', String $db_datadir = '/opt/vuln-dashboard/dbdata', String $pocs_storage_dir = '/opt/vuln-dashboard/pocsdata', - String $sso_service_name = 'dashboard-local', + String $sso_service_name = 'dashboard-dev', ) { $db_name=lookup('vuln-dashboard.dn_name', undef, undef, 'sunet') diff --git a/global/overlay/etc/puppet/modules/soc/templates/vuln-dashboard/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/soc/templates/vuln-dashboard/docker-compose.yml.erb index 0b8db07..cf7d84b 100644 --- a/global/overlay/etc/puppet/modules/soc/templates/vuln-dashboard/docker-compose.yml.erb +++ b/global/overlay/etc/puppet/modules/soc/templates/vuln-dashboard/docker-compose.yml.erb @@ -3,11 +3,11 @@ services: # copy that's run locally in docker, # app files are mounted for quick-reload and fast iterations - local: + dev: container_name: <%= @sso_service_name %> depends_on: - postgres - image: dashboard-local:<%= @docker_tag %> + image: dashboard-dev:<%= @docker_tag %> pull_policy: never environment: DB_NAME: <%= @db_name %>