Release 2021.4.0

blackducksoftware · Apr 29, 2021 · 83d8096 · 83d8096
1 parent d235fcf
commit 83d8096
Show file tree

Hide file tree

Showing 24 changed files with 537 additions and 334 deletions.
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.2.1 archive:
+## Location of Black Duck 2021.4.0 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2021.2.1.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.4.0.tar.gz
 
 NOTE:
 
@@ -21,6 +21,7 @@ https://github.com/blackducksoftware/hub/releases
 ## Location of Black Duck Docker images:
 
 * https://hub.docker.com/r/blackducksoftware/blackduck-authentication/
+* https://hub.docker.com/r/blackducksoftware/blackduck-bomengine/
 * https://hub.docker.com/r/blackducksoftware/blackduck-cfssl/ 
 * https://hub.docker.com/r/blackducksoftware/blackduck-documentation/
 * https://hub.docker.com/r/blackducksoftware/blackduck-jobrunner/

diff --git a/docker-swarm/bin/system_check.sh b/docker-swarm/bin/system_check.sh
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.2.1
+HUB_VERSION=2021.4.0
 
 # Specify any property-specific overrides here
 #

diff --git a/docker-swarm/docker-compose.bdba.yml b/docker-swarm/docker-compose.bdba.yml
@@ -5,14 +5,19 @@ version: '3.6'
 
 services:
   binaryscanner:
-    image: sigsynopsys/bdba-worker:2020.12-1
+    image: sigsynopsys/bdba-worker:2021.03
     env_file: [hub-bdba.env]
     entrypoint: /docker-entrypoint.sh
+    healthcheck:
+       test:  [CMD, 'sh', '-c', '/srv/venv/appcheck-client/bin/celery inspect -b $$(printf $$BROKER_URL $$BROKER_PASSWORD) -q -d celery@appcheck-worker.$$(hostname) --timeout 10 ping']
+       interval: 30s
+       timeout: 10s
+       retries: 3
     deploy:
       mode: replicated
       restart_policy: {condition: on-failure, delay: 5s, window: 60s}
       resources:
         limits: {memory: 2048M, cpus: '1'}
         reservations: {memory: 2048M, cpus: '1'}
   rabbitmq:
-    env_file: [hub-bdba.env]
+    env_file: [hub-bdba.env]
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.2.1
+    image: blackducksoftware/blackduck-authentication:2021.4.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.2.1
+    image: blackducksoftware/blackduck-webapp:2021.4.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.2.1
+    image: blackducksoftware/blackduck-scan:2021.4.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.2.1
+    image: blackducksoftware/blackduck-jobrunner:2021.4.0
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -132,7 +132,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.2.1
+    image: blackducksoftware/blackduck-registration:2021.4.0
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -154,7 +154,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   webserver:
-    image: blackducksoftware/blackduck-nginx:1.0.30
+    image: blackducksoftware/blackduck-nginx:1.0.31
     ports: ['443:8443']
     env_file: [hub-webserver.env, blackduck-config.env]
     environment:
@@ -175,7 +175,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.2.1
+    image: blackducksoftware/blackduck-documentation:2021.4.0
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -195,7 +195,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   uploadcache:
-      image: blackducksoftware/blackduck-upload-cache:1.0.15
+      image: blackducksoftware/blackduck-upload-cache:1.0.16
       env_file: [blackduck-config.env]
       environment:
         HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -216,7 +216,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.2.1
+    image: blackducksoftware/blackduck-redis:2021.4.0
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -238,7 +238,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.2.1
+    image: blackducksoftware/blackduck-bomengine:2021.4.0
     env_file: [blackduck-config.env , hub-postgres.env]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -262,8 +262,9 @@ services:
   rabbitmq:
     image: blackducksoftware/rabbitmq:1.2.2
     hostname: rabbitmq
-    tmpfs: [/opt/blackduck/rabbitmq/security]
-    volumes: ['rabbitmq-data-volume:/var/lib/rabbitmq']
+    volumes: 
+      - rabbitmq-data-volume:/var/lib/rabbitmq
+      - {type: tmpfs, target: /opt/blackduck/rabbitmq/security}
     environment: {
       BLACKDUCK_RABBIT_SCAOP: 'true'
     }
@@ -281,4 +282,4 @@ services:
           limits: {memory: 1024M}
           reservations: {memory: 1024M}
 volumes: {postgres96-data-volume: null, authentication-volume: null, cert-volume: null,
-  config-volume: null, log-volume: null, monitor-log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
+  config-volume: null, log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
diff --git a/docker-swarm/docker-compose.readonly.yml b/docker-swarm/docker-compose.readonly.yml
@@ -81,7 +81,6 @@ services:
     read_only: true
     volumes:
       - /etc/rabbitmq
-  kb:
-    read_only: true
-    volumes:
+      - /var/log/rabbitmq
+      - /opt/blackduck/hub/filebeat
       - /tmp
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.2.1
+    image: blackducksoftware/blackduck-redis:2021.4.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.2.1
+    image: blackducksoftware/blackduck-redis:2021.4.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.2.1
+    image: blackducksoftware/blackduck-redis:2021.4.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.2.1
+    image: blackducksoftware/blackduck-redis:2021.4.0
     env_file: [blackduck-config.env]
     hostname: redissentinel3
     user: redis:root

diff --git a/docker-swarm/docker-compose.yml b/docker-swarm/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     stop_grace_period: 60s
   authentication:
     user: authentication:root
-    image: blackducksoftware/blackduck-authentication:2021.2.1
+    image: blackducksoftware/blackduck-authentication:2021.4.0
     volumes:
     - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
@@ -48,7 +48,7 @@ services:
         reservations: {memory: 1024M}
   webapp:
     user: webapp:root
-    image: blackducksoftware/blackduck-webapp:2021.2.1
+    image: blackducksoftware/blackduck-webapp:2021.4.0
     volumes:
     - log-volume:/opt/blackduck/hub/logs
     - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
@@ -72,7 +72,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   scan:
     user: scan:root
-    image: blackducksoftware/blackduck-scan:2021.2.1
+    image: blackducksoftware/blackduck-scan:2021.4.0
     env_file: [blackduck-config.env ]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -95,7 +95,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   jobrunner:
     user: jobrunner:root
-    image: blackducksoftware/blackduck-jobrunner:2021.2.1
+    image: blackducksoftware/blackduck-jobrunner:2021.4.0
     env_file: [blackduck-config.env ]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -150,7 +150,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.2.1
+    image: blackducksoftware/blackduck-registration:2021.4.0
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -172,7 +172,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   webserver:
-    image: blackducksoftware/blackduck-nginx:1.0.30
+    image: blackducksoftware/blackduck-nginx:1.0.31
     ports: ['443:8443']
     env_file: [hub-webserver.env, blackduck-config.env]
     environment:
@@ -193,7 +193,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.2.1
+    image: blackducksoftware/blackduck-documentation:2021.4.0
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -213,7 +213,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   uploadcache:
-      image: blackducksoftware/blackduck-upload-cache:1.0.15
+      image: blackducksoftware/blackduck-upload-cache:1.0.16
       env_file: [blackduck-config.env]
       environment:
         HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -234,7 +234,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.2.1
+    image: blackducksoftware/blackduck-redis:2021.4.0
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -256,7 +256,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.2.1
+    image: blackducksoftware/blackduck-bomengine:2021.4.0
     env_file: [blackduck-config.env ]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -280,8 +280,9 @@ services:
   rabbitmq:
     image: blackducksoftware/rabbitmq:1.2.2
     hostname: rabbitmq
-    tmpfs: [/opt/blackduck/rabbitmq/security]
-    volumes: ['rabbitmq-data-volume:/var/lib/rabbitmq']
+    volumes: 
+      - rabbitmq-data-volume:/var/lib/rabbitmq
+      - {type: tmpfs, target: /opt/blackduck/rabbitmq/security}
     environment: {
       BLACKDUCK_RABBIT_SCAOP: 'true'
     }
@@ -299,4 +300,4 @@ services:
           limits: {memory: 1024M}
           reservations: {memory: 1024M}
 volumes: {postgres96-data-volume: null, authentication-volume: null, cert-volume: null,
-  config-volume: null, log-volume: null, monitor-log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
+  config-volume: null, log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
diff --git a/docker-swarm/hub-webserver.env b/docker-swarm/hub-webserver.env
@@ -15,7 +15,7 @@ IPV4_ONLY=0
 
 # Define TLS_PROTOCOLS in order to override supported protocols (default: TLSv1.2)
 # for instance:
-#TLS_PROTOCOLS=TLSv1.1 TLSv1.2
+#TLS_PROTOCOLS=TLSv1.2
 
 # Change this to 1 if you are also using Black Duck Alert.
 # This will enable Alert routes in 'webserver'

diff --git a/docs/en_US/getting_started.pdf b/docs/en_US/getting_started.pdf
diff --git a/docs/en_US/install_kubernetes.pdf b/docs/en_US/install_kubernetes.pdf
diff --git a/docs/en_US/install_openshift.pdf b/docs/en_US/install_openshift.pdf
diff --git a/docs/en_US/install_swarm.pdf b/docs/en_US/install_swarm.pdf
diff --git a/docs/en_US/release_notes.pdf b/docs/en_US/release_notes.pdf
diff --git a/docs/ja_JA/getting_started.pdf b/docs/ja_JA/getting_started.pdf
diff --git a/docs/ja_JA/install_kubernetes.pdf b/docs/ja_JA/install_kubernetes.pdf
diff --git a/docs/ja_JA/install_openshift.pdf b/docs/ja_JA/install_openshift.pdf
diff --git a/docs/ja_JA/install_swarm.pdf b/docs/ja_JA/install_swarm.pdf
diff --git a/docs/ja_JA/release_notes.pdf b/docs/ja_JA/release_notes.pdf
diff --git a/kubernetes/blackduck/Chart.yaml b/kubernetes/blackduck/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2021.2.1
+appVersion: 2021.4.0
 name: blackduck
 description: Black Duck Helm Chart
-version: 2021.2.1
+version: 2021.4.0
diff --git a/kubernetes/blackduck/README.md b/kubernetes/blackduck/README.md
@@ -210,7 +210,7 @@ The following table lists the configurable parameters of the Black Duck chart an
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `registry` | Image repository | `docker.io/blackducksoftware` |
-| `imageTag` | Version of Black Duck | `2021.2.1` |
+| `imageTag` | Version of Black Duck | `2021.4.0` |
 | `imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` |
 | `sealKey` | Seal key to encrypt the master key when Source code upload is enabled and it should be of length 32 | `abcdefghijklmnopqrstuvwxyz123456` |
 | `tlsCertSecretName` | Name of Webserver TLS Secret containing Certificates (if not provided Certificates will be generated) | |
@@ -304,7 +304,7 @@ The following table lists the configurable parameters of the Black Duck chart an
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `binaryscanner.registry` | Image repository to be override at container level | `docker.io/sigsynopsys` |
-| `binaryscanner.imageTag` | Image tag to be override at container level | `2020.12-1` |
+| `binaryscanner.imageTag` | Image tag to be override at container level | `2021.03` |
 | `binaryscanner.resources.limits.Cpu` | Binary Scanner container CPU Limit | `1000m` |
 | `binaryscanner.resources.requests.Cpu` | Binary Scanner container CPU request | `1000m` |
 | `binaryscanner.resources.limits.memory` | Binary Scanner container Memory Limit | `2048Mi` |
@@ -444,7 +444,7 @@ The following table lists the configurable parameters of the Black Duck chart an
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `uploadcache.registry` | Image repository to be override at container level |  |
-| `uploadcache.imageTag` | Image tag to be override at container level | `1.0.15` |
+| `uploadcache.imageTag` | Image tag to be override at container level | `1.0.16` |
 | `uploadcache.resources.limits.memory` | Upload cache container Memory Limit | `512Mi` |
 | `uploadcache.resources.requests.memory` | Upload cache container Memory request | `512Mi` |
 | `uploadcache.persistentVolumeClaimName` | Point to an existing Upload cache Persistent Volume Claim (PVC) | |
@@ -498,7 +498,7 @@ The following table lists the configurable parameters of the Black Duck chart an
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
 | `webserver.registry` | Image repository to be override at container level |  |
-| `webserver.imageTag` | Image tag to be override at container level | `1.0.30` |
+| `webserver.imageTag` | Image tag to be override at container level | `1.0.31` |
 | `webserver.resources.limits.memory` | Webserver container Memory Limit | `512Mi` |
 | `webserver.resources.requests.memory` | Webserver container Memory request | `512Mi` |
 | `webserver.nodeSelector` | Webserver node labels for pod assignment | `{}` |

diff --git a/kubernetes/blackduck/templates/_datadog.tpl b/kubernetes/blackduck/templates/_datadog.tpl
@@ -6,7 +6,7 @@
   value: {{ .serviceName | quote }}
 - name: DD_TRACE_ENABLED
   value: "true"
-- name: DD_PROFILE_ENABLED
+- name: DD_PROFILING_ENABLED
   value: "true"
 - name: DD_JMXFETCH_ENABLED
   value: "true"