verglasz/soc-ops
0
0
Fork 0
forked from SUNET/soc-ops
Code Pull requests Activity

Use correct docker image for vuln-dashboard

Browse source
This commit is contained in:
Johan Björklund 2024-12-06 13:54:07 +01:00
parent 2b9213eec9
commit dbedbd7340
Signed by untrusted user: bjorklund
GPG key ID: 5E8401339C7F5037
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -27,7 +27,7 @@
soc::sso: soc::sso:
hostname: 'vul-dashboard-test.cert.sunet.se' hostname: 'vul-dashboard-test.cert.sunet.se'
email: 'cert@cert.sunet.se' email: 'cert@cert.sunet.se'
service_endpoint: 'http://dashboard-local:8000' service_endpoint: 'http://dashboard-dev:8000'
x_remote_user: true x_remote_user: true
groups: groups:
- 'sunet-cert' - 'sunet-cert'

2
global/overlay/etc/puppet/modules/soc/manifests/vuln_dashboard.pp
View file

@ -3,7 +3,7 @@ class soc::vuln_dashboard(
String $docker_tag = 'latest', String $docker_tag = 'latest',
String $db_datadir = '/opt/vuln-dashboard/dbdata', String $db_datadir = '/opt/vuln-dashboard/dbdata',
String $pocs_storage_dir = '/opt/vuln-dashboard/pocsdata', 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') $db_name=lookup('vuln-dashboard.dn_name', undef, undef, 'sunet')

4
global/overlay/etc/puppet/modules/soc/templates/vuln-dashboard/docker-compose.yml.erb
View file

@ -3,11 +3,11 @@ services:
# copy that's run locally in docker, # copy that's run locally in docker,
# app files are mounted for quick-reload and fast iterations # app files are mounted for quick-reload and fast iterations
local: dev:
container_name: <%= @sso_service_name %> container_name: <%= @sso_service_name %>
depends_on: depends_on:
- postgres - postgres
image: dashboard-local:<%= @docker_tag %> image: dashboard-dev:<%= @docker_tag %>
pull_policy: never pull_policy: never
environment: environment:
DB_NAME: <%= @db_name %> DB_NAME: <%= @db_name %>