Commits

Jeppe Borup Larsen authored 8cbc3ed83ac 
fjernede path delen af env_file
No tags
b9d04575ba9
main

docker-compose.yml

Modified
16 16 #Shared build area for the two different nsp-deptrack instances
17 17 build-data:
18 18 ​
19 19 services:
20 20 dep-track-api:
21 21 image: dependencytrack/apiserver:4.10.1
22 22 restart: unless-stopped
23 23 depends_on:
24 24 - dep-track-postgres
25 25 env_file:
26 - - path: "deptrack.env"
26 + - "deptrack.env"
27 27 environment:
28 28 ALPINE_DATABASE_MODE: external
29 29 ALPINE_DATABASE_URL: ${DEPTRACK_DB_URL:-jdbc:postgresql://dep-track-postgres:5432/dtrack}
30 30 ALPINE_DATABASE_DRIVER: org.postgresql.Driver
31 31 ALPINE_DATABASE_USERNAME: ${DEPTRACK_DB_USER}
32 32 ALPINE_DATABASE_PASSWORD: ${DEPTRACK_DB_PASS}
33 33 ​
34 34 ALPINE_METRICS_ENABLED: true
35 35 ​
36 36 volumes:
48 48 proxy:
49 49 image: registry.nspop.dk/tools/nsp-deptrack/deptrack-proxy:$VERSION
50 50 restart: unless-stopped
51 51 ports:
52 52 - '9002:80'
53 53 ​
54 54 builder:
55 55 image: registry.nspop.dk/tools/nsp-deptrack/builder:$VERSION
56 56 restart: unless-stopped
57 57 env_file:
58 - - path: "svn.env"
59 - - path: "deptrack.env"
58 + - "svn.env"
59 + - "deptrack.env"
60 60 environment:
61 61 SVN_USERNAME: ${SVN_USERNAME}
62 62 SVN_PASSWORD: ${SVN_PASSWORD}
63 63 DEP_TRACK_API_KEY: ${DEP_TRACK_API_KEY}
64 64 SONARQUBE_RUNNER: http://sonar-runner:9999
65 65 TARGET_DIR: /build/nsp_dep
66 66 LOG_DIR: /build/nsp_dep_log
67 67 DEP_TRACK_URL: http://dep-track-api:8080
68 68 volumes:
69 69 - build-data:/build
70 70 entrypoint: ["/app/nsp-deptrack", "-daily"]
71 71 ​
72 72 sonar-runner:
73 73 image: registry.nspop.dk/tools/nsp-deptrack/sonar_runner:$VERSION
74 74 restart: unless-stopped
75 75 env_file:
76 - - path: "svn.env"
77 - - path: "sonarqube.env"
76 + - "svn.env"
77 + - "sonarqube.env"
78 78 environment:
79 79 SVN_USERNAME: ${SVN_USERNAME}
80 80 SVN_PASSWORD: ${SVN_PASSWORD}
81 81 SONARQUBE_TOKEN: ${SONARQUBE_TOKEN}
82 82 TARGET_DIR: /build/nsp_dep
83 83 LOG_DIR: /build/nsp_dep_log
84 84 volumes:
85 85 - build-data:/build
86 86 ​
87 87 dep-track-postgres:
88 88 image: postgres:15.3-alpine
89 89 restart: unless-stopped
90 90 env_file:
91 - - path: "deptrack.env"
91 + - "deptrack.env"
92 92 environment:
93 93 POSTGRES_USER: ${DEPTRACK_DB_USER}
94 94 POSTGRES_PASSWORD: ${DEPTRACK_DB_PASS}
95 95 POSTGRES_DB: dtrack
96 96 ​
97 97 volumes:
98 98 - dep_track_postgres:/var/lib/postgresql/data
99 99 ​
100 100 ​
101 101 #SonarQube
102 102 sonarqube:
103 103 image: sonarqube:10.4.1-community
104 104 restart: unless-stopped
105 105 depends_on:
106 106 - sonarqube-db
107 107 env_file:
108 - - path: "sonarqube.env"
108 + - "sonarqube.env"
109 109 environment:
110 110 SONAR_JDBC_URL: ${SONAR_DB_URL:-jdbc:postgresql://sonarqube-db:5432/sonar}
111 111 SONAR_JDBC_USERNAME: ${SONAR_DB_USER}
112 112 SONAR_JDBC_PASSWORD: ${SONAR_DB_PASS}
113 113 ports:
114 114 - '9003:9000'
115 115 volumes:
116 116 - sonarqube_data:/opt/sonarqube/data
117 117 - sonarqube_extensions:/opt/sonarqube/extensions
118 118 - sonarqube_logs:/opt/sonarqube/logs
119 119 ​
120 120 sonarqube-db:
121 121 image: postgres:15.3-alpine
122 122 restart: unless-stopped
123 123 env_file:
124 - - path: "sonarqube.env"
124 + - "sonarqube.env"
125 125 environment:
126 126 POSTGRES_USER: ${SONAR_DB_USER}
127 127 POSTGRES_PASSWORD: ${SONAR_DB_PASS}
128 128 POSTGRES_DB: sonar
129 129 volumes:
130 130 - sonarqube_postgresql:/var/lib/postgresql
131 131 - sonarqube_postgresql_data:/var/lib/postgresql/data

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut