Release 2021.6.0

blackducksoftware · Jun 30, 2021 · 3214c07 · 3214c07
1 parent 8e327bc
commit 3214c07
Show file tree

Hide file tree

Showing 38 changed files with 1,597 additions and 120 deletions.
diff --git a/README.containers.md b/README.containers.md
@@ -130,6 +130,47 @@ The container will need to expose 8443 to other containers that will links to it
 This container runs as UID 100. If the container is started as UID 0 (root) then the user will be switched to UID 100:root before executing it's main process.
 This container is also able to be started as a random UID as long as it is also started within the root group (GID/fsGroup 0).
 
+# MATCHENGINE Container (blackduck-matchengine)
+----
+
+## Container Description
+
+The Match Engine is responsible for making calls to the Knowlegde Base in the cloud and gather the components information. 
+
+## Scalability
+
+This container can be scaled.
+
+## Links/Ports
+
+This container will need to connect to these other containers/services
+
+* postgres
+* cfssl
+* logstash
+* registration
+
+The container will need to expose 8443 to other containers that will links to it.
+
+## Alternate Host Name Environment Variables
+
+* postgres - $HUB_POSTGRES_HOST
+* cfssl - $HUB_CFSSL_HOST
+* logstash - $HUB_LOGSTASH_HOST
+* registration - $HUB_REGISTRATION_HOST
+
+## Resources/Constraints
+
+* Default Max Java Heap Size: 1 GB
+* Container Memory: 1.5 GB
+* Container CPU: 1cpu
+
+## Users/Groups
+
+This container runs as UID 100. If the container is started as UID 0 (root) then the user will be switched to UID 100:root before executing it's main process.
+This container is also able to be started as a random UID as long as it is also started within the root group (GID/fsGroup 0).
+
+
 # Scan Container (blackduck-scan)
 ----
 
@@ -372,6 +413,7 @@ There are times when running in other types of orchestrations that any individua
 * webapp - $HUB_WEBAPP_HOST
 * authentication - $HUB_AUTHENTICATION_HOST
 * scan - $HUB_SCAN_HOST
+* matchengine - $HUB_MATCHENGINE_HOST
 * cfssl - $HUB_CFSSL_HOST
 * documentation - $HUB_DOC_HOST
 * upload cache - $HUB_UPLOAD_CACHE_HOST

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 This repository contains orchestration files and documentation for deploying Black Duck Docker containers. 
 
-## Location of Black Duck 2021.4.2 archive:
+## Location of Black Duck 2021.6.0 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2021.4.2.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.6.0.tar.gz
 
 NOTE:
 
@@ -33,6 +33,7 @@ https://github.com/blackducksoftware/hub/releases
 * https://hub.docker.com/r/blackducksoftware/blackduck-webapp/
 * https://hub.docker.com/r/blackducksoftware/blackduck-upload-cache/
 * https://hub.docker.com/r/blackducksoftware/blackduck-redis/
+* https://hub.docker.com/r/blackducksoftware/blackduck-matchengine/
 * https://hub.docker.com/r/sigsynopsys/bdba-worker/
 * https://hub.docker.com/r/blackducksoftware/rabbitmq/
 

diff --git a/docker-swarm/README.md b/docker-swarm/README.md
@@ -351,6 +351,7 @@ There are currently several containers that need access to services hosted by Bl
 * registration
 * scan
 * webapp
+* kb
 
 If a proxy is required for external internet access you'll need to configure it. 
 
@@ -375,6 +376,7 @@ There are several containers that will require the proxy password:
 * registration
 * scan
 * webapp
+* kb
 
 #### LDAP Trust Store Password
 
@@ -395,6 +397,7 @@ The proxy password secret will need to be added to the services:
 * registration
 * scan
 * webapp
+* kb
 
 In each of these service sections, you'll need to add:
 
@@ -548,7 +551,7 @@ docker service scale hub_jobrunner=1
 
 ### External PostgreSQL Settings
 
-The external PostgreSQL instance needs to initialized by creating users, databases, etc., and connection information must be provided to the _authentication_, _bomengine_, _jobrunner_, _scan_ and _webapp_ containers.
+The external PostgreSQL instance needs to initialized by creating users, databases, etc., and connection information must be provided to the _authentication_, _bomengine_, _jobrunner_, _scan_, _kb_ and _webapp_ containers.
 
 #### Steps
 
@@ -570,7 +573,7 @@ The external PostgreSQL instance needs to initialized by creating users, databas
 
 1. Create a file named 'HUB_POSTGRES_USER_PASSWORD_FILE' with the password for the *blackduck_user* user.
 2. Create a file named 'HUB_POSTGRES_ADMIN_PASSWORD_FILE' with the password for the *blackduck* user.
-3. Mount the directory containing 'HUB_POSTGRES_USER_PASSWORD_FILE' and 'HUB_POSTGRES_ADMIN_PASSWORD_FILE' to /run/secrets in _authentication_, _bomengine_, _jobrunner_, _scan_ and _webapp_ containers.
+3. Mount the directory containing 'HUB_POSTGRES_USER_PASSWORD_FILE' and 'HUB_POSTGRES_ADMIN_PASSWORD_FILE' to /run/secrets in _authentication_, _bomengine_, _jobrunner_, _scan_, _kb_ and _webapp_ containers.
 
 ##### Create Docker secrets
 
@@ -581,6 +584,7 @@ The password secrets will need to be added to the services:
 * jobrunner
 * scan
 * webapp
+* kb
 
 In each of these service sections, you'll need to add:
 
@@ -616,6 +620,7 @@ For each of the services below, add the secret by
 * scan
 * webapp
 * registration
+* kb
 
 ```
 secrets:

diff --git a/docker-swarm/bin/hub_add_replication_user.sh b/docker-swarm/bin/hub_add_replication_user.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-1.0.16}
+HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-swarm/bin/hub_create_data_dump.sh b/docker-swarm/bin/hub_create_data_dump.sh
@@ -7,7 +7,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-1.0.16}
+HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 database_name=""

diff --git a/docker-swarm/bin/hub_db_migrate.sh b/docker-swarm/bin/hub_db_migrate.sh
@@ -14,7 +14,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-1.0.16}
+HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 SCHEMA_NAME=${HUB_POSTGRES_SCHEMA:-st}
 function fail() {

diff --git a/docker-swarm/bin/hub_replication_changepassword.sh b/docker-swarm/bin/hub_replication_changepassword.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-1.0.16}
+HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-swarm/bin/hub_reportdb_changepassword.sh b/docker-swarm/bin/hub_reportdb_changepassword.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-1.0.16}
+HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {