Release 2021.2.0

blackducksoftware · Feb 25, 2021 · 58bfdad · 58bfdad
1 parent 6331067
commit 58bfdad
Show file tree

Hide file tree

Showing 27 changed files with 223 additions and 77 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 2020.12.0 archive:
+## Location of Black Duck 2021.2.0 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2020.12.0.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.2.0.tar.gz
 
 NOTE:
 

diff --git a/docker-swarm/README.md b/docker-swarm/README.md
@@ -383,7 +383,7 @@ There are two methods for specifying an LDAP trust store password when using Doc
 * Add a 'docker secret' called 'LDAP_TRUST_STORE_PASSWORD_FILE'.
 * Mount a directory that contains a file called 'LDAP_TRUST_STORE_PASSWORD_FILE' to /run/secrets (better to use secrets here).
 
-This configuration is only needed when adding a custom Black Duck web application trust store.
+This configuration is only needed when adding a custom LDAP trust store to the Black Duck authentication service.
 
 #### Adding the proxy password secret
 
@@ -552,7 +552,7 @@ The external PostgreSQL instance needs to initialized by creating users, databas
 
 #### Steps
 
-1. Create a database user named _blackduck_ with admisitrator privileges.  (On Amazon RDS, do this by setting the "Master User" to "blackduck" when creating the RDS instance.)
+1. Create a database user named _blackduck_ with administrator privileges.  (On Amazon RDS, do this by setting the "Master User" to "blackduck" when creating the RDS instance.)
 2. In the script 'external-postgres-init.pgsql', replace 'POSTGRESQL_USER' with 'blackduck', replace 'HUB_POSTGRES_USER' with 'blackduck_user', and replace 'BLACKDUCK_USER_PASSWORD' with password you want to use for 'blackduck_user'
    ```bash
    export POSTGRESQL_USER=blackduck && export HUB_POSTGRES_USER=blackduck_user && export BLACKDUCK_USER_PASSWORD=CHANGEME123

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=2020.12.0
+HUB_VERSION=2021.2.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:2020.09-1
+    image: sigsynopsys/bdba-worker:2020.12-1
     env_file: [hub-bdba.env]
     entrypoint: /docker-entrypoint.sh
     deploy:

diff --git a/docker-swarm/docker-compose.dbmigrate.yml b/docker-swarm/docker-compose.dbmigrate.yml
@@ -12,7 +12,7 @@ services:
     user: 'cfssl:root'
 
   logstash:
-    image: blackducksoftware/blackduck-logstash:1.0.8
+    image: blackducksoftware/blackduck-logstash:1.0.9
     volumes:
       - log-volume:/var/lib/logstash/data
     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:2020.12.0
+    image: blackducksoftware/blackduck-authentication:2021.2.0
     volumes:
     - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
@@ -30,10 +30,9 @@ services:
         reservations: {memory: 1024M}
   webapp:
     user: webapp:root
-    image: blackducksoftware/blackduck-webapp:2020.12.0
+    image: blackducksoftware/blackduck-webapp:2021.2.0
     volumes:
     - log-volume:/opt/blackduck/hub/logs
-    - webapp-volume:/opt/blackduck/hub/hub-webapp/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
@@ -55,7 +54,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   scan:
     user: scan:root
-    image: blackducksoftware/blackduck-scan:2020.12.0
+    image: blackducksoftware/blackduck-scan:2021.2.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',
@@ -69,7 +68,7 @@ services:
       HUB_MAX_MEMORY: 2048m
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
     volumes:
-    - {type: tmpfs, target: /opt/blackduck/hub/hub-scan/security}    
+    - {type: tmpfs, target: /opt/blackduck/hub/hub-scan/security}
     deploy:
       mode: replicated
       restart_policy: {condition: on-failure, delay: 5s, window: 60s}
@@ -78,7 +77,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   jobrunner:
     user: jobrunner:root
-    image: blackducksoftware/blackduck-jobrunner:2020.12.0
+    image: blackducksoftware/blackduck-jobrunner:2021.2.0
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -89,7 +88,7 @@ services:
        retries: 15
        start_period: 7200s
     environment:
-       HUB_MAX_MEMORY: 2048m
+       HUB_MAX_MEMORY: 4096m
        HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
     volumes:
     - {type: tmpfs, target: /opt/blackduck/hub/jobrunner/security}
@@ -116,7 +115,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   logstash:
-    image: blackducksoftware/blackduck-logstash:1.0.8
+    image: blackducksoftware/blackduck-logstash:1.0.9
     volumes: ['log-volume:/var/lib/logstash/data']
     env_file: [blackduck-config.env]
     healthcheck:
@@ -133,7 +132,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2020.12.0
+    image: blackducksoftware/blackduck-registration:2021.2.0
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -155,7 +154,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   webserver:
-    image: blackducksoftware/blackduck-nginx:1.0.26
+    image: blackducksoftware/blackduck-nginx:1.0.30
     ports: ['443:8443']
     env_file: [hub-webserver.env, blackduck-config.env]
     environment:
@@ -176,7 +175,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   documentation:
-    image: blackducksoftware/blackduck-documentation:2020.12.0
+    image: blackducksoftware/blackduck-documentation:2021.2.0
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -217,7 +216,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2020.12.0
+    image: blackducksoftware/blackduck-redis:2021.2.0
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -239,7 +238,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2020.12.0
+    image: blackducksoftware/blackduck-bomengine:2021.2.0
     env_file: [blackduck-config.env , hub-postgres.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -251,6 +250,8 @@ services:
       timeout: 60s
       retries: 15
     user: bomengine:root
+    volumes:
+      - { type: tmpfs, target: /opt/blackduck/hub/blackduck-bomengine/security }
     deploy:
         mode: replicated
         restart_policy: {condition: on-failure, delay: 5s, window: 60s}
@@ -279,5 +280,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, webapp-volume: null,
-  monitor-log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
+  config-volume: null, log-volume: null, monitor-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
@@ -80,4 +80,8 @@ services:
   rabbitmq:
     read_only: true
     volumes:
-      - /etc/rabbitmq
+      - /etc/rabbitmq
+  kb:
+    read_only: true
+    volumes:
+      - /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:2020.12.0
+    image: blackducksoftware/blackduck-redis:2021.2.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:2020.12.0
+    image: blackducksoftware/blackduck-redis:2021.2.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:2020.12.0
+    image: blackducksoftware/blackduck-redis:2021.2.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:2020.12.0
+    image: blackducksoftware/blackduck-redis:2021.2.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:2020.12.0
+    image: blackducksoftware/blackduck-authentication:2021.2.0
     volumes:
     - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
@@ -48,10 +48,9 @@ services:
         reservations: {memory: 1024M}
   webapp:
     user: webapp:root
-    image: blackducksoftware/blackduck-webapp:2020.12.0
+    image: blackducksoftware/blackduck-webapp:2021.2.0
     volumes:
     - log-volume:/opt/blackduck/hub/logs
-    - webapp-volume:/opt/blackduck/hub/hub-webapp/ldap
     - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
     env_file: [blackduck-config.env ]
     healthcheck:
@@ -73,7 +72,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   scan:
     user: scan:root
-    image: blackducksoftware/blackduck-scan:2020.12.0
+    image: blackducksoftware/blackduck-scan:2021.2.0
     env_file: [blackduck-config.env ]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
@@ -87,7 +86,7 @@ services:
       HUB_MAX_MEMORY: 2048m
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
     volumes:
-    - {type: tmpfs, target: /opt/blackduck/hub/hub-scan/security}    
+    - {type: tmpfs, target: /opt/blackduck/hub/hub-scan/security}
     deploy:
       mode: replicated
       restart_policy: {condition: on-failure, delay: 5s, window: 60s}
@@ -96,7 +95,7 @@ services:
         reservations: {cpus: '1', memory: 2560M}
   jobrunner:
     user: jobrunner:root
-    image: blackducksoftware/blackduck-jobrunner:2020.12.0
+    image: blackducksoftware/blackduck-jobrunner:2021.2.0
     env_file: [blackduck-config.env ]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -134,7 +133,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   logstash:
-    image: blackducksoftware/blackduck-logstash:1.0.8
+    image: blackducksoftware/blackduck-logstash:1.0.9
     volumes: ['log-volume:/var/lib/logstash/data']
     env_file: [blackduck-config.env]
     healthcheck:
@@ -151,7 +150,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2020.12.0
+    image: blackducksoftware/blackduck-registration:2021.2.0
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -173,7 +172,7 @@ services:
         limits: {memory: 640M}
         reservations: {memory: 640M}
   webserver:
-    image: blackducksoftware/blackduck-nginx:1.0.26
+    image: blackducksoftware/blackduck-nginx:1.0.30
     ports: ['443:8443']
     env_file: [hub-webserver.env, blackduck-config.env]
     environment:
@@ -194,7 +193,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   documentation:
-    image: blackducksoftware/blackduck-documentation:2020.12.0
+    image: blackducksoftware/blackduck-documentation:2021.2.0
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -235,7 +234,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2020.12.0
+    image: blackducksoftware/blackduck-redis:2021.2.0
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -257,7 +256,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2020.12.0
+    image: blackducksoftware/blackduck-bomengine:2021.2.0
     env_file: [blackduck-config.env ]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -269,6 +268,8 @@ services:
       timeout: 60s
       retries: 15
     user: bomengine:root
+    volumes:
+      - { type: tmpfs, target: /opt/blackduck/hub/blackduck-bomengine/security }
     deploy:
         mode: replicated
         restart_policy: {condition: on-failure, delay: 5s, window: 60s}
@@ -297,5 +298,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, webapp-volume: null,
-  monitor-log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
+  config-volume: null, log-volume: null, monitor-log-volume: null, uploadcache-volume: null, uploadcache-keys-volume: null, rabbitmq-data-volume: null }
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: 2020.12.0
+appVersion: 2021.2.0
 name: blackduck
 description: Black Duck Helm Chart
-version: 2020.12.0
+version: 2021.2.0