Skip to content

Commit

Permalink
Release 2021.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Used to build SIG applications committed Aug 12, 2021
1 parent 49a1de2 commit 15d9f8c
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 37 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.6.1 archive:
## Location of Black Duck 2021.6.2 archive:

https://github.com/blackducksoftware/hub/archive/v2021.6.1.tar.gz
https://github.com/blackducksoftware/hub/archive/v2021.6.2.tar.gz

NOTE:

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.6.1}"
readonly HUB_VERSION="${HUB_VERSION:-2021.6.2}"
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.6.1
HUB_VERSION=2021.6.2

# Specify any property-specific overrides here
#
Expand Down
22 changes: 11 additions & 11 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.6.1
image: blackducksoftware/blackduck-authentication:2021.6.2
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.6.1
image: blackducksoftware/blackduck-webapp:2021.6.2
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.6.1
image: blackducksoftware/blackduck-scan:2021.6.2
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.6.1
image: blackducksoftware/blackduck-jobrunner:2021.6.2
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.6.1
image: blackducksoftware/blackduck-registration:2021.6.2
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand All @@ -158,7 +158,7 @@ services:
limits: {memory: 640M}
reservations: {memory: 640M}
webserver:
image: blackducksoftware/blackduck-nginx:2.0.3
image: blackducksoftware/blackduck-nginx:2.0.5
ports: ['443:8443']
env_file: [hub-webserver.env, blackduck-config.env]
environment:
Expand All @@ -179,7 +179,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
webui:
image: blackducksoftware/blackduck-webui:2021.6.1
image: blackducksoftware/blackduck-webui:2021.6.2
links: [cfssl, logstash]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
Expand All @@ -198,7 +198,7 @@ services:
reservations: {cpus: '0.5', memory: 640M}

documentation:
image: blackducksoftware/blackduck-documentation:2021.6.1
image: blackducksoftware/blackduck-documentation:2021.6.2
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand Down Expand Up @@ -239,7 +239,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
redis:
image: blackducksoftware/blackduck-redis:2021.6.1
image: blackducksoftware/blackduck-redis:2021.6.2
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -261,7 +261,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
bomengine:
image: blackducksoftware/blackduck-bomengine:2021.6.1
image: blackducksoftware/blackduck-bomengine:2021.6.2
env_file: [blackduck-config.env , hub-postgres.env]
environment:
HUB_MAX_MEMORY: 4096m
Expand All @@ -283,7 +283,7 @@ services:
limits: {memory: 4608M}
reservations: {memory: 1536M}
matchengine:
image: blackducksoftware/blackduck-matchengine:2021.6.1
image: blackducksoftware/blackduck-matchengine:2021.6.2
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.6.1
image: blackducksoftware/blackduck-redis:2021.6.2
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.6.1
image: blackducksoftware/blackduck-redis:2021.6.2
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.6.1
image: blackducksoftware/blackduck-redis:2021.6.2
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.6.1
image: blackducksoftware/blackduck-redis:2021.6.2
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 @@ -24,7 +24,7 @@ services:
stop_grace_period: 60s
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2021.6.1
image: blackducksoftware/blackduck-authentication:2021.6.2
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.6.1
image: blackducksoftware/blackduck-webapp:2021.6.2
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.6.1
image: blackducksoftware/blackduck-scan:2021.6.2
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.6.1
image: blackducksoftware/blackduck-jobrunner:2021.6.2
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.6.1
image: blackducksoftware/blackduck-registration:2021.6.2
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand All @@ -176,7 +176,7 @@ services:
limits: {memory: 640M}
reservations: {memory: 640M}
webserver:
image: blackducksoftware/blackduck-nginx:2.0.3
image: blackducksoftware/blackduck-nginx:2.0.5
ports: ['443:8443']
env_file: [hub-webserver.env, blackduck-config.env]
environment:
Expand All @@ -197,7 +197,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
webui:
image: blackducksoftware/blackduck-webui:2021.6.1
image: blackducksoftware/blackduck-webui:2021.6.2
links: [cfssl, logstash]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
Expand All @@ -216,7 +216,7 @@ services:
reservations: {cpus: '0.5', memory: 640M}

documentation:
image: blackducksoftware/blackduck-documentation:2021.6.1
image: blackducksoftware/blackduck-documentation:2021.6.2
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand Down Expand Up @@ -257,7 +257,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
redis:
image: blackducksoftware/blackduck-redis:2021.6.1
image: blackducksoftware/blackduck-redis:2021.6.2
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -279,7 +279,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
bomengine:
image: blackducksoftware/blackduck-bomengine:2021.6.1
image: blackducksoftware/blackduck-bomengine:2021.6.2
env_file: [blackduck-config.env ]
environment:
HUB_MAX_MEMORY: 4096m
Expand All @@ -301,7 +301,7 @@ services:
limits: {memory: 4608M}
reservations: {memory: 1536M}
matchengine:
image: blackducksoftware/blackduck-matchengine:2021.6.1
image: blackducksoftware/blackduck-matchengine:2021.6.2
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/getting_started.pdf
Binary file not shown.
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.6.1
appVersion: 2021.6.2
name: blackduck
description: Black Duck Helm Chart
version: 2021.6.1
version: 2021.6.2
4 changes: 2 additions & 2 deletions kubernetes/blackduck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.1` |
| `imageTag` | Version of Black Duck | `2021.6.2` |
| `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 @@ -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 | `2.0.3` |
| `webserver.imageTag` | Image tag to be override at container level | `2.0.5` |
| `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 | `{}` |
Expand Down
6 changes: 3 additions & 3 deletions kubernetes/blackduck/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ fullnameOverride:
isKubernetes: true
isAzure: false

imageTag: "2021.6.1"
imageTag: "2021.6.2"

# Docker registry to pull Black Duck images
registry: docker.io/blackducksoftware
Expand Down Expand Up @@ -391,7 +391,7 @@ webserver:
# override the docker registry at container level
registry:
# override the global imageTag
imageTag: 2.0.3
imageTag: 2.0.5
nodeSelector: {}
tolerations: []
affinity: {}
Expand All @@ -402,7 +402,7 @@ webserver:
webui:
# override the docker registry at container level
registry:
imageTag: 2021.6.1
imageTag: 2021.6.2
nodeSelector: {}
tolerations: []
affinity: {}
Expand Down

0 comments on commit 15d9f8c

Please sign in to comment.