Skip to content

Commit

Permalink
Release 2022.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
blackduck-serv-builder committed Jun 17, 2022
1 parent 0bd10ac commit 518e653
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 33 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 2022.4.1 archive:
## Location of Black Duck 2022.4.2 archive:

https://github.com/blackducksoftware/hub/archive/v2022.4.1.tar.gz
https://github.com/blackducksoftware/hub/archive/v2022.4.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:-2022.4.1}"
readonly HUB_VERSION="${HUB_VERSION:-2022.4.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 @@ -24,7 +24,7 @@ BLACKDUCK_CORS_ALLOW_CREDENTIALS_PROP_NAME=

# Do not change
HUB_PRODUCT_NAME=BLACK_DUCK
HUB_VERSION=2022.4.1
HUB_VERSION=2022.4.2

# Specify any property-specific overrides here
#
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 @@ -10,7 +10,7 @@ x-pg-usage-settings: &pg-usage-settings
services:
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2022.4.1
image: blackducksoftware/blackduck-authentication:2022.4.2
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -31,7 +31,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2022.4.1
image: blackducksoftware/blackduck-webapp:2022.4.2
volumes:
- log-volume:/opt/blackduck/hub/logs
- {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
Expand All @@ -52,7 +52,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2022.4.1
image: blackducksoftware/blackduck-scan:2022.4.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 @@ -72,7 +72,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2022.4.1
image: blackducksoftware/blackduck-jobrunner:2022.4.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 @@ -123,7 +123,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
registration:
image: blackducksoftware/blackduck-registration:2022.4.1
image: blackducksoftware/blackduck-registration:2022.4.2
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -161,7 +161,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 15s, window: 60s}
webui:
image: blackducksoftware/blackduck-webui:2022.4.1
image: blackducksoftware/blackduck-webui:2022.4.2
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 @@ -176,7 +176,7 @@ services:
restart_policy: {condition: on-failure, delay: 15s, window: 60s}

documentation:
image: blackducksoftware/blackduck-documentation:2022.4.1
image: blackducksoftware/blackduck-documentation:2022.4.2
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand Down Expand Up @@ -211,7 +211,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
redis:
image: blackducksoftware/blackduck-redis:2022.4.1
image: blackducksoftware/blackduck-redis:2022.4.2
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -230,7 +230,7 @@ services:
deploy:
restart_policy: {condition: any}
bomengine:
image: blackducksoftware/blackduck-bomengine:2022.4.1
image: blackducksoftware/blackduck-bomengine:2022.4.2
env_file: [blackduck-config.env , hub-postgres.env]
environment:
<< : *pg-usage-settings
Expand All @@ -249,7 +249,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
matchengine:
image: blackducksoftware/blackduck-matchengine:2022.4.1
image: blackducksoftware/blackduck-matchengine:2022.4.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:2022.4.1
image: blackducksoftware/blackduck-redis:2022.4.2
env_file: [blackduck-config.env]
user: redis:root
stop_grace_period: 60s
Expand All @@ -25,7 +25,7 @@ services:
limits: {memory: 2048M}
reservations: {memory: 2048M}
redissentinel1:
image: blackducksoftware/blackduck-redis:2022.4.1
image: blackducksoftware/blackduck-redis:2022.4.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:2022.4.1
image: blackducksoftware/blackduck-redis:2022.4.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:2022.4.1
image: blackducksoftware/blackduck-redis:2022.4.2
env_file: [blackduck-config.env]
hostname: redissentinel3
user: redis:root
Expand Down
20 changes: 10 additions & 10 deletions docker-swarm/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2022.4.1
image: blackducksoftware/blackduck-authentication:2022.4.2
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -60,7 +60,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2022.4.1
image: blackducksoftware/blackduck-webapp:2022.4.2
volumes:
- log-volume:/opt/blackduck/hub/logs
- {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
Expand All @@ -81,7 +81,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2022.4.1
image: blackducksoftware/blackduck-scan:2022.4.2
env_file: [blackduck-config.env ]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand All @@ -101,7 +101,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2022.4.1
image: blackducksoftware/blackduck-jobrunner:2022.4.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 @@ -152,7 +152,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
registration:
image: blackducksoftware/blackduck-registration:2022.4.1
image: blackducksoftware/blackduck-registration:2022.4.2
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -190,7 +190,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 15s, window: 60s}
webui:
image: blackducksoftware/blackduck-webui:2022.4.1
image: blackducksoftware/blackduck-webui:2022.4.2
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 @@ -205,7 +205,7 @@ services:
restart_policy: {condition: on-failure, delay: 15s, window: 60s}

documentation:
image: blackducksoftware/blackduck-documentation:2022.4.1
image: blackducksoftware/blackduck-documentation:2022.4.2
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand Down Expand Up @@ -240,7 +240,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
redis:
image: blackducksoftware/blackduck-redis:2022.4.1
image: blackducksoftware/blackduck-redis:2022.4.2
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -259,7 +259,7 @@ services:
deploy:
restart_policy: {condition: any}
bomengine:
image: blackducksoftware/blackduck-bomengine:2022.4.1
image: blackducksoftware/blackduck-bomengine:2022.4.2
env_file: [blackduck-config.env ]
environment:
<< : *pg-usage-settings
Expand All @@ -278,7 +278,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
matchengine:
image: blackducksoftware/blackduck-matchengine:2022.4.1
image: blackducksoftware/blackduck-matchengine:2022.4.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/install_kubernetes.pdf
Binary file not shown.
Binary file modified docs/en_US/install_openshift.pdf
Binary file not shown.
Binary file modified docs/en_US/install_swarm.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: 2022.4.1
appVersion: 2022.4.2
name: blackduck
description: Black Duck Helm Chart
version: 2022.4.1
version: 2022.4.2
2 changes: 1 addition & 1 deletion kubernetes/blackduck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,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 | `2022.4.1` |
| `imageTag` | Version of Black Duck | `2022.4.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
4 changes: 2 additions & 2 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: "2022.4.1"
imageTag: "2022.4.2"

# Docker registry to pull Black Duck images
registry: docker.io/blackducksoftware
Expand Down Expand Up @@ -430,7 +430,7 @@ webserver:
webui:
# override the docker registry at container level
registry:
imageTag: 2022.4.1
imageTag: 2022.4.2
nodeSelector: {}
tolerations: []
affinity: {}
Expand Down

0 comments on commit 518e653

Please sign in to comment.