Release 2021.6.1

blackducksoftware · Jul 28, 2021 · 49a1de2 · 49a1de2
1 parent 3214c07
commit 49a1de2
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 39 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.6.0 archive:
+## Location of Black Duck 2021.6.1 archive:
 
-https://github.com/blackducksoftware/hub/archive/v2021.6.0.tar.gz
+https://github.com/blackducksoftware/hub/archive/v2021.6.1.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.0}"
+readonly HUB_VERSION="${HUB_VERSION:-2021.6.1}"
 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}"

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.0
+HUB_VERSION=2021.6.1
 
 # 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,14 @@ version: '3.6'
 
 services:
   binaryscanner:
-    image: sigsynopsys/bdba-worker:2021.5.1
+    image: sigsynopsys/bdba-worker:2021.06
     env_file: [hub-bdba.env]
     entrypoint: /docker-entrypoint.sh
     healthcheck:
        test:  [CMD, '/docker-healthcheck.sh']
-       interval: 30s
-       timeout: 10s
-       retries: 3
+       interval: 300s
+       timeout: 200s
+       retries: 10
     deploy:
       mode: replicated
       restart_policy: {condition: on-failure, delay: 5s, window: 60s}

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.0
+    image: blackducksoftware/blackduck-authentication:2021.6.1
     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.0
+    image: blackducksoftware/blackduck-webapp:2021.6.1
     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.0
+    image: blackducksoftware/blackduck-scan:2021.6.1
     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.0
+    image: blackducksoftware/blackduck-jobrunner:2021.6.1
     env_file: [blackduck-config.env , hub-postgres.env]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -136,7 +136,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.6.0
+    image: blackducksoftware/blackduck-registration:2021.6.1
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -179,7 +179,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   webui:
-    image: blackducksoftware/blackduck-webui:2021.6.0
+    image: blackducksoftware/blackduck-webui:2021.6.1
     links: [cfssl, logstash]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -198,7 +198,7 @@ services:
         reservations: {cpus: '0.5', memory: 640M}
 
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.6.0
+    image: blackducksoftware/blackduck-documentation:2021.6.1
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -239,7 +239,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.6.0
+    image: blackducksoftware/blackduck-redis:2021.6.1
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -261,7 +261,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.6.0
+    image: blackducksoftware/blackduck-bomengine:2021.6.1
     env_file: [blackduck-config.env , hub-postgres.env]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -283,7 +283,7 @@ services:
           limits: {memory: 4608M}
           reservations: {memory: 1536M}
   matchengine:
-    image: blackducksoftware/blackduck-matchengine:2021.6.0
+    image: blackducksoftware/blackduck-matchengine:2021.6.1
     user: matchengine:root
     healthcheck:
       test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',

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.0
+    image: blackducksoftware/blackduck-redis:2021.6.1
     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.0
+    image: blackducksoftware/blackduck-redis:2021.6.1
     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.0
+    image: blackducksoftware/blackduck-redis:2021.6.1
     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.0
+    image: blackducksoftware/blackduck-redis:2021.6.1
     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.6.0
+    image: blackducksoftware/blackduck-authentication:2021.6.1
     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.6.0
+    image: blackducksoftware/blackduck-webapp:2021.6.1
     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.6.0
+    image: blackducksoftware/blackduck-scan:2021.6.1
     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.6.0
+    image: blackducksoftware/blackduck-jobrunner:2021.6.1
     env_file: [blackduck-config.env ]
     healthcheck:
        test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -154,7 +154,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   registration:
-    image: blackducksoftware/blackduck-registration:2021.6.0
+    image: blackducksoftware/blackduck-registration:2021.6.1
     volumes:
     - config-volume:/opt/blackduck/hub/hub-registration/config
     - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
@@ -197,7 +197,7 @@ services:
         limits: {memory: 512M}
         reservations: {memory: 512M}
   webui:
-    image: blackducksoftware/blackduck-webui:2021.6.0
+    image: blackducksoftware/blackduck-webui:2021.6.1
     links: [cfssl, logstash]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
@@ -216,7 +216,7 @@ services:
         reservations: {cpus: '0.5', memory: 640M}
 
   documentation:
-    image: blackducksoftware/blackduck-documentation:2021.6.0
+    image: blackducksoftware/blackduck-documentation:2021.6.1
     env_file: [blackduck-config.env]
     user: documentation:root
     environment:
@@ -257,7 +257,7 @@ services:
           limits: {memory: 512M}
           reservations: {memory: 512M}
   redis:
-    image: blackducksoftware/blackduck-redis:2021.6.0
+    image: blackducksoftware/blackduck-redis:2021.6.1
     env_file: [blackduck-config.env]
     environment:
       HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
@@ -279,7 +279,7 @@ services:
         limits: {memory: 1024M}
         reservations: {memory: 1024M}
   bomengine:
-    image: blackducksoftware/blackduck-bomengine:2021.6.0
+    image: blackducksoftware/blackduck-bomengine:2021.6.1
     env_file: [blackduck-config.env ]
     environment:
       HUB_MAX_MEMORY: 4096m
@@ -301,7 +301,7 @@ services:
           limits: {memory: 4608M}
           reservations: {memory: 1536M}
   matchengine:
-    image: blackducksoftware/blackduck-matchengine:2021.6.0
+    image: blackducksoftware/blackduck-matchengine:2021.6.1
     user: matchengine:root
     healthcheck:
       test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',

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/kubernetes/blackduck/Chart.yaml b/kubernetes/blackduck/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: 2021.6.0
+appVersion: 2021.6.1
 name: blackduck
 description: Black Duck Helm Chart
-version: 2021.6.0
+version: 2021.6.1
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.6.0` |
+| `imageTag` | Version of Black Duck | `2021.6.1` |
 | `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 | `2021.5.1` |
+| `binaryscanner.imageTag` | Image tag to be override at container level | `2021.06` |
 | `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` |

diff --git a/kubernetes/blackduck/values.yaml b/kubernetes/blackduck/values.yaml
@@ -8,7 +8,7 @@ fullnameOverride:
 isKubernetes: true
 isAzure: false
 
-imageTag: "2021.6.0"
+imageTag: "2021.6.1"
 
 # Docker registry to pull Black Duck images
 registry: docker.io/blackducksoftware
@@ -169,7 +169,7 @@ binaryscanner:
   # override the docker registry at container level
   registry: "docker.io/sigsynopsys"
   # override the global imageTag
-  imageTag: 2021.5.1
+  imageTag: 2021.06
   nodeSelector: {}
   tolerations: []
   affinity: {}
@@ -402,7 +402,7 @@ webserver:
 webui:
   # override the docker registry at container level
   registry:
-  imageTag: 2021.6.0
+  imageTag: 2021.6.1
   nodeSelector: {}
   tolerations: []
   affinity: {}