Skip to content

Commit

Permalink
Release v2021.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
sig-rlloyd committed Dec 7, 2021
1 parent b6ba31c commit cc095e3
Show file tree
Hide file tree
Showing 19 changed files with 58 additions and 44 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

This repository contains orchestration files and documentation for deploying Black Duck Docker containers.

## Location of Black Duck 2021.10.0 archive:
## Location of Black Duck 2021.10.1 archive:

https://github.com/blackducksoftware/hub/archive/v2021.10.0.tar.gz
https://github.com/blackducksoftware/hub/archive/v2021.10.1.tar.gz

NOTE:

Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_add_replication_user.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.3}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.4}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_create_data_dump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.3}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.4}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

database_name=""
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_db_migrate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.3}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.4}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
SCHEMA_NAME=${HUB_POSTGRES_SCHEMA:-st}
function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_recreate_reportdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.3}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.4}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}


Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_replication_changepassword.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.3}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.4}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_reportdb_changepassword.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.3}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-9.6-1.4}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/system_check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.10.0}"
readonly HUB_VERSION="${HUB_VERSION:-2021.10.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}"
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/blackduck-config.env
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BLACKDUCK_CORS_EXPOSED_HEADERS_PROP_NAME=

# Do not change
HUB_PRODUCT_NAME=BLACK_DUCK
HUB_VERSION=2021.10.0
HUB_VERSION=2021.10.1

# Specify any property-specific overrides here
#
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.bdba.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3.6'

services:
binaryscanner:
image: sigsynopsys/bdba-worker:2021.9.1
image: sigsynopsys/bdba-worker:2021.9.2
env_file: [hub-bdba.env]
entrypoint: /docker-entrypoint.sh
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.dbmigrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ services:
user: 'logstash:root'

postgres:
image: blackducksoftware/blackduck-postgres:9.6-1.3
image: blackducksoftware/blackduck-postgres:9.6-1.4
volumes:
- postgres96-data-volume:/var/lib/postgresql/data
healthcheck:
Expand Down
20 changes: 10 additions & 10 deletions docker-swarm/docker-compose.externaldb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: '3.6'
services:
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2021.10.0
image: blackducksoftware/blackduck-authentication:2021.10.1
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -30,7 +30,7 @@ services:
reservations: {memory: 1024M}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2021.10.0
image: blackducksoftware/blackduck-webapp:2021.10.1
volumes:
- log-volume:/opt/blackduck/hub/logs
- {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
Expand All @@ -54,7 +54,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2021.10.0
image: blackducksoftware/blackduck-scan:2021.10.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',
Expand All @@ -77,7 +77,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2021.10.0
image: blackducksoftware/blackduck-jobrunner:2021.10.1
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
Expand Down Expand Up @@ -136,7 +136,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
registration:
image: blackducksoftware/blackduck-registration:2021.10.0
image: blackducksoftware/blackduck-registration:2021.10.1
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -179,7 +179,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
webui:
image: blackducksoftware/blackduck-webui:2021.10.0
image: blackducksoftware/blackduck-webui:2021.10.1
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
/opt/blackduck/hub/hub-ui/security/root.crt]
Expand All @@ -197,7 +197,7 @@ services:
reservations: {cpus: '0.5', memory: 640M}

documentation:
image: blackducksoftware/blackduck-documentation:2021.10.0
image: blackducksoftware/blackduck-documentation:2021.10.1
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand Down Expand Up @@ -238,7 +238,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
redis:
image: blackducksoftware/blackduck-redis:2021.10.0
image: blackducksoftware/blackduck-redis:2021.10.1
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -260,7 +260,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
bomengine:
image: blackducksoftware/blackduck-bomengine:2021.10.0
image: blackducksoftware/blackduck-bomengine:2021.10.1
env_file: [blackduck-config.env , hub-postgres.env]
environment:
HUB_MAX_MEMORY: 4096m
Expand All @@ -282,7 +282,7 @@ services:
limits: {memory: 4608M}
reservations: {memory: 1536M}
matchengine:
image: blackducksoftware/blackduck-matchengine:2021.10.0
image: blackducksoftware/blackduck-matchengine:2021.10.1
user: matchengine:root
healthcheck:
test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand Down
8 changes: 4 additions & 4 deletions docker-swarm/docker-compose.redis.sentinel.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.6'
services:
redisslave:
image: blackducksoftware/blackduck-redis:2021.10.0
image: blackducksoftware/blackduck-redis:2021.10.1
env_file: [blackduck-config.env]
user: redis:root
stop_grace_period: 60s
Expand All @@ -25,7 +25,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
redissentinel1:
image: blackducksoftware/blackduck-redis:2021.10.0
image: blackducksoftware/blackduck-redis:2021.10.1
env_file: [blackduck-config.env]
hostname: redissentinel1
user: redis:root
Expand All @@ -47,7 +47,7 @@ services:
limits: {memory: 32M}
reservations: {memory: 32M}
redissentinel2:
image: blackducksoftware/blackduck-redis:2021.10.0
image: blackducksoftware/blackduck-redis:2021.10.1
env_file: [blackduck-config.env]
hostname: redissentinel2
user: redis:root
Expand All @@ -69,7 +69,7 @@ services:
limits: {memory: 32M}
reservations: {memory: 32M}
redissentinel3:
image: blackducksoftware/blackduck-redis:2021.10.0
image: blackducksoftware/blackduck-redis:2021.10.1
env_file: [blackduck-config.env]
hostname: redissentinel3
user: redis:root
Expand Down
22 changes: 11 additions & 11 deletions docker-swarm/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3.6'

services:
postgres:
image: blackducksoftware/blackduck-postgres:9.6-1.3
image: blackducksoftware/blackduck-postgres:9.6-1.4
ports: ['55436:5432']
volumes: ['postgres96-data-volume:/var/lib/postgresql/data' ]
healthcheck:
Expand All @@ -24,7 +24,7 @@ services:
stop_grace_period: 60s
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2021.10.0
image: blackducksoftware/blackduck-authentication:2021.10.1
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -48,7 +48,7 @@ services:
reservations: {memory: 1024M}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2021.10.0
image: blackducksoftware/blackduck-webapp:2021.10.1
volumes:
- log-volume:/opt/blackduck/hub/logs
- {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
Expand All @@ -72,7 +72,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2021.10.0
image: blackducksoftware/blackduck-scan:2021.10.1
env_file: [blackduck-config.env ]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand All @@ -95,7 +95,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2021.10.0
image: blackducksoftware/blackduck-jobrunner:2021.10.1
env_file: [blackduck-config.env ]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
Expand Down Expand Up @@ -154,7 +154,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
registration:
image: blackducksoftware/blackduck-registration:2021.10.0
image: blackducksoftware/blackduck-registration:2021.10.1
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -197,7 +197,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
webui:
image: blackducksoftware/blackduck-webui:2021.10.0
image: blackducksoftware/blackduck-webui:2021.10.1
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
/opt/blackduck/hub/hub-ui/security/root.crt]
Expand All @@ -215,7 +215,7 @@ services:
reservations: {cpus: '0.5', memory: 640M}

documentation:
image: blackducksoftware/blackduck-documentation:2021.10.0
image: blackducksoftware/blackduck-documentation:2021.10.1
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand Down Expand Up @@ -256,7 +256,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
redis:
image: blackducksoftware/blackduck-redis:2021.10.0
image: blackducksoftware/blackduck-redis:2021.10.1
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -278,7 +278,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
bomengine:
image: blackducksoftware/blackduck-bomengine:2021.10.0
image: blackducksoftware/blackduck-bomengine:2021.10.1
env_file: [blackduck-config.env ]
environment:
HUB_MAX_MEMORY: 4096m
Expand All @@ -300,7 +300,7 @@ services:
limits: {memory: 4608M}
reservations: {memory: 1536M}
matchengine:
image: blackducksoftware/blackduck-matchengine:2021.10.0
image: blackducksoftware/blackduck-matchengine:2021.10.1
user: matchengine:root
healthcheck:
test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand Down
Binary file modified docs/en_US/release_notes.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions kubernetes/blackduck/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: 2021.10.0
appVersion: 2021.10.1
name: blackduck
description: Black Duck Helm Chart
version: 2021.10.0
version: 2021.10.1
4 changes: 2 additions & 2 deletions kubernetes/blackduck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,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.10.0` |
| `imageTag` | Version of Black Duck | `2021.10.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) | |
Expand Down Expand Up @@ -318,7 +318,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.9.1` |
| `binaryscanner.imageTag` | Image tag to be override at container level | `2021.9.2` |
| `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` |
Expand Down
14 changes: 14 additions & 0 deletions kubernetes/blackduck/templates/binary-scanner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,13 @@ spec:
successThreshold: 1
failureThreshold: 3
timeoutSeconds: 10
volumeMounts:
- name: {{ .Release.Name }}-worker-applog
mountPath: /app-log
- name: {{ .Release.Name }}-worker-tmp
mountPath: /tmp
- name: {{ .Release.Name }}-worker-var-tmp
mountPath: /var/tmp
resources:
{{- toYaml .Values.binaryscanner.resources | nindent 12 }}
{{- with .Values.binaryscanner.securityContext }}
Expand Down Expand Up @@ -138,4 +145,11 @@ spec:
{{- end }}
serviceAccountName: {{ .Release.Name }}-blackduck-service-account
restartPolicy: Always
volumes:
- name: {{ .Release.Name }}-worker-tmp
emptyDir: {}
- name: {{ .Release.Name }}-worker-var-tmp
emptyDir: {}
- name: {{ .Release.Name }}-worker-applog
emptyDir: {}
{{- end }}
Loading

0 comments on commit cc095e3

Please sign in to comment.