Release 2021.8.0

Badalshiva · Aug 30, 2021 · ca366e7 · ca366e7
1 parent 15d9f8c
commit ca366e7
Show file tree

Hide file tree

Showing 37 changed files with 148 additions and 81 deletions.
diff --git a/README.containers.md b/README.containers.md
@@ -161,8 +161,8 @@ The container will need to expose 8443 to other containers that will links to it
 
 ## Resources/Constraints
 
-* Default Max Java Heap Size: 1 GB
-* Container Memory: 1.5 GB
+* Default Max Java Heap Size: 4 GB
+* Container Memory: 4.5GB
 * Container CPU: 1cpu
 
 ## Users/Groups

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.6.2 archive:
+## Location of Black Duck 2021.8.0 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2021.6.2.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.8.0.tar.gz
 
 NOTE:
 

diff --git a/docker-swarm/bin/system_check.sh b/docker-swarm/bin/system_check.sh
@@ -41,7 +41,7 @@ set -o noglob
 
 readonly NOW="$(date +"%Y%m%dT%H%M%S%z")"
 readonly NOW_ZULU="$(date -u +"%Y%m%dT%H%M%SZ")"
-readonly HUB_VERSION="${HUB_VERSION:-2021.6.2}"
+readonly HUB_VERSION="${HUB_VERSION:-2021.8.0}"
 readonly OUTPUT_FILE="${SYSTEM_CHECK_OUTPUT_FILE:-system_check_${NOW}.txt}"
 readonly PROPERTIES_FILE="${SYSTEM_CHECK_PROPERTIES_FILE:-${OUTPUT_FILE%.txt}.properties}"
 readonly SUMMARY_FILE="${SYSTEM_CHECK_SUMMARY_FILE:-${OUTPUT_FILE%.txt}_summary.properties}"
@@ -71,7 +71,7 @@ declare -a CONTAINER_SIZES=(
     "hub_cfssl=512 640 640"
     "hub_documentation=512 512 512"
     "hub_jobrunner=4608 4608 4608"
-    "hub_matchengine=512 768 1024"
+    "hub_matchengine=4608 4608 4608"
     "hub_logstash=1024 1024 1024"
     "hub_postgres=3072 3072 3072"
     "hub_rabbitmq=1024 1024 512"
@@ -93,7 +93,7 @@ declare -a MEM_SIZES=(
     #"hub_authentication=1024 1024 1024"
     "hub_bomengine=4096 7168 13824"
     "hub_jobrunner=4096 7168 13824"
-    "hub_matchengine=1024 2048 4096"
+    "hub_matchengine=4096 7168 13824"
     #"hub_registration=512 512 512"
     "hub_scan=2048 5120 9728"
     "hub_webapp=2048 6144 10752"
@@ -132,6 +132,32 @@ readonly PASS="PASS"
 readonly WARN="WARNING"
 readonly FAIL="FAIL"
 
+# See https://sig-confluence.internal.synopsys.com/display/SIGBD/Architecture+Overview
+declare -a REPLICABLE=(
+    # "SERVICE=status"
+    "hub_alert=$WARN"
+    "hub_alert_database=$FAIL"
+    "hub_authentication=$FAIL"
+    #"hub_binaryscanner=$PASS"
+    #"hub_bomengine=$PASS"
+    "hub_cfssl=$FAIL"
+    "hub_documentation=$WARN"
+    #"hub_jobrunner=$PASS"
+    "hub_logstash=$FAIL"
+    #"hub_matchengine=$PASS"
+    "hub_postgresql=$FAIL"
+    "hub_rabbitmq=$FAIL"
+    "hub_redis=$FAIL"
+    "hub_redissentinel=$FAIL"
+    #"hub_redisslave=$PASS"
+    "hub_registration=$FAIL"
+    #"hub_scan=$PASS"
+    "hub_uploadcache=$FAIL"
+    "hub_webapp=$FAIL"
+    "hub_webserver=$WARN"
+    #"hub_webui=$PASS"
+)
+
 readonly MB=1048576
 readonly GB=$((MB * 1024))
 
@@ -2089,6 +2115,13 @@ get_installation_size() {
             ts_details+=(" - memory size of $memory MB for $service suggests ${TS_RATING[$points]} installation")
         fi
 
+        # Complain if there are too many replicas
+        # shellcheck disable=SC2155 # We don't care about the array_get exit code
+        local replicable="$(array_get "${REPLICABLE[@]}" "$service")"
+        if [[ -n "$replicable" ]] && [[ "$replicable" != "$PASS" ]] && [[ $replicas -gt 1 ]]; then
+            ts_messages+=("$replicable: $service has $replicas replicas")
+        fi
+
         # Size based on replica counts.
         # shellcheck disable=SC2155 # We don't care about the array_get exit code
         local replica_steps="$(array_get "${REPLICA_SIZES[@]}" "$service")"
@@ -2204,6 +2237,7 @@ _get_container_size_info() {
                     service="hub_alert_database";;
                 (blackducksoftware/blackduck-grafana* | \
                  blackducksoftware/blackduck-prometheus* | \
+                 blackducksoftware/blackduck-cadvisor* | \
                  blackducksoftware/kb_* | \
                  blackducksoftware/kbapi* | \
                  docker.elastic.co/kibana* | \

diff --git a/docker-swarm/blackduck-config.env b/docker-swarm/blackduck-config.env
@@ -22,7 +22,7 @@ BLACKDUCK_CORS_EXPOSED_HEADERS_PROP_NAME=
 
 # Do not change
 HUB_PRODUCT_NAME=BLACK_DUCK
-HUB_VERSION=2021.6.2
+HUB_VERSION=2021.8.0
 
 # Specify any property-specific overrides here
 #

diff --git a/docker-swarm/docker-compose.bdba.yml b/docker-swarm/docker-compose.bdba.yml
@@ -5,7 +5,7 @@ version: '3.6'
 
 services:
   binaryscanner:
-    image: sigsynopsys/bdba-worker:2021.06
+    image: sigsynopsys/bdba-worker:2021.7.0
     env_file: [hub-bdba.env]
     entrypoint: /docker-entrypoint.sh
     healthcheck:

diff --git a/docker-swarm/docker-compose.dbmigrate.yml b/docker-swarm/docker-compose.dbmigrate.yml
@@ -1,7 +1,7 @@
 version: '3.6'
 services:
   cfssl:
-    image: blackducksoftware/blackduck-cfssl:1.0.2
+    image: blackducksoftware/blackduck-cfssl:1.0.3
     volumes:
       - cert-volume:/etc/cfssl
     healthcheck:

diff --git a/docker-swarm/docker-compose.externaldb.yml b/docker-swarm/docker-compose.externaldb.yml
@@ -6,7 +6,7 @@ version: '3.6'
 services:
   authentication:
     user: authentication:root
-    image: blackducksoftware/blackduck-authentication:2021.6.2
+    image: blackducksoftware/blackduck-authentication:2021.8.0
     volumes:
     - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
@@ -30,7 +30,7 @@ services:
         reservations: {memory: 1024M}
   webapp:
     user: webapp:root
-    image: blackducksoftware/blackduck-webapp:2021.6.2
+    image: blackducksoftware/blackduck-webapp:2021.8.0
     volumes:
     - log-volume:/opt/blackduck/hub/logs
     - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
@@ -54,7 +54,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   scan:
     user: scan:root
-    image: blackducksoftware/blackduck-scan:2021.6.2
+    image: blackducksoftware/blackduck-scan:2021.8.0
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -77,7 +77,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   jobrunner:
     user: jobrunner:root
-    image: blackducksoftware/blackduck-jobrunner:2021.6.2
+    image: blackducksoftware/blackduck-jobrunner:2021.8.0
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -103,7 +103,7 @@ services:
         limits: {cpus: '1', memory: 4608M}
         reservations: {cpus: '1', memory: 4608M}
   cfssl:
-    image: blackducksoftware/blackduck-cfssl:1.0.2
+    image: blackducksoftware/blackduck-cfssl:1.0.3
     volumes: ['cert-volume:/etc/cfssl']
     env_file: [blackduck-config.env]
     healthcheck:
@@ -136,7 +136,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.6.2
+    image: blackducksoftware/blackduck-registration:2021.8.0
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -158,7 +158,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   webserver:
-    image: blackducksoftware/blackduck-nginx:2.0.5
+    image: blackducksoftware/blackduck-nginx:2.0.6
     ports: ['443:8443']
     env_file: [hub-webserver.env, blackduck-config.env]
     environment:
@@ -179,8 +179,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   webui:
-    image: blackducksoftware/blackduck-webui:2021.6.2
-    links: [cfssl, logstash]
+    image: blackducksoftware/blackduck-webui:2021.8.0
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
         /opt/blackduck/hub/hub-ui/security/root.crt]
@@ -198,7 +197,7 @@ services:
         reservations: {cpus: '0.5', memory: 640M}
 
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.6.2
+    image: blackducksoftware/blackduck-documentation:2021.8.0
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -218,7 +217,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   uploadcache:
-      image: blackducksoftware/blackduck-upload-cache:1.0.17
+      image: blackducksoftware/blackduck-upload-cache:1.0.18
       env_file: [blackduck-config.env]
       environment:
         HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -239,7 +238,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.6.2
+    image: blackducksoftware/blackduck-redis:2021.8.0
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -261,7 +260,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.6.2
+    image: blackducksoftware/blackduck-bomengine:2021.8.0
     env_file: [blackduck-config.env , hub-postgres.env]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -283,7 +282,7 @@ services:
           limits: {memory: 4608M}
           reservations: {memory: 1536M}
   matchengine:
-    image: blackducksoftware/blackduck-matchengine:2021.6.2
+    image: blackducksoftware/blackduck-matchengine:2021.8.0
     user: matchengine:root
     healthcheck:
       test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -300,12 +299,13 @@ services:
       mode: replicated
       restart_policy: { condition: on-failure, delay: 5s, window: 60s }
       resources:
-        limits: { memory: 1536M, cpus: '1' }
-        reservations: { memory: 1024M, cpus: '0.5' }
+        limits: { memory: 4608M, cpus: '1' }
+        reservations: { memory: 1536M, cpus: '1' }
     environment:
+      HUB_MAX_MEMORY: 4096m
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
   rabbitmq:
-    image: blackducksoftware/rabbitmq:1.2.2
+    image: blackducksoftware/rabbitmq:1.2.3
     hostname: rabbitmq
     volumes: 
       - rabbitmq-data-volume:/var/lib/rabbitmq

diff --git a/docker-swarm/docker-compose.redis.sentinel.yml b/docker-swarm/docker-compose.redis.sentinel.yml
@@ -1,7 +1,7 @@
 version: '3.6'
 services:
   redisslave:
-    image: blackducksoftware/blackduck-redis:2021.6.2
+    image: blackducksoftware/blackduck-redis:2021.8.0
     env_file: [blackduck-config.env]
     user: redis:root
     stop_grace_period: 60s
@@ -25,7 +25,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   redissentinel1:
-    image: blackducksoftware/blackduck-redis:2021.6.2
+    image: blackducksoftware/blackduck-redis:2021.8.0
     env_file: [blackduck-config.env]
     hostname: redissentinel1
     user: redis:root
@@ -47,7 +47,7 @@ services:
         limits: {memory: 32M}
         reservations: {memory: 32M}
   redissentinel2:
-    image: blackducksoftware/blackduck-redis:2021.6.2
+    image: blackducksoftware/blackduck-redis:2021.8.0
     env_file: [blackduck-config.env]
     hostname: redissentinel2
     user: redis:root
@@ -69,7 +69,7 @@ services:
         limits: {memory: 32M}
         reservations: {memory: 32M}
   redissentinel3:
-    image: blackducksoftware/blackduck-redis:2021.6.2
+    image: blackducksoftware/blackduck-redis:2021.8.0
     env_file: [blackduck-config.env]
     hostname: redissentinel3
     user: redis:root