Skip to content

Commit

Permalink
Release 2023.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
blackduck-serv-builder committed Oct 31, 2023
1 parent 2184f9a commit e11a13a
Show file tree
Hide file tree
Showing 61 changed files with 288 additions and 212 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -2,9 +2,9 @@

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

## Location of Black Duck 2023.7.2 archive:
## Location of Black Duck 2023.10.0 archive:

https://github.com/blackducksoftware/hub/archive/v2023.7.2.tar.gz
https://github.com/blackducksoftware/hub/archive/v2023.10.0.tar.gz

NOTE:

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

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.28}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
4 changes: 2 additions & 2 deletions docker-swarm/bin/hub_create_data_dump.sh
Expand Up @@ -5,8 +5,8 @@
# 2. The database container has been properly initialized.

HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.28}
HUB_VERSION=${HUB_VERSION:-2023.7.2}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16}
HUB_VERSION=${HUB_VERSION:-2023.10.0}
OPT_FORCE=
OPT_LIVE_SYSTEM=
OPT_MAX_CPU=${MAX_CPU:-1}
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_db_migrate.sh
Expand Up @@ -14,7 +14,7 @@
set -o errexit

HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.28}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16}
OPT_MAX_CPU=${MAX_CPU:-1}
OPT_NO_DATABASE=${NO_DATABASE:-}
OPT_NO_STORAGE=${NO_STORAGE:-}
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_replication_changepassword.sh
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.28}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16}
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
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.28}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.16}
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
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:-2023.7.2}"
readonly HUB_VERSION="${HUB_VERSION:-2023.10.0}"
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
7 changes: 3 additions & 4 deletions docker-swarm/blackduck-config.env
Expand Up @@ -24,7 +24,7 @@ BLACKDUCK_CORS_ALLOW_CREDENTIALS_PROP_NAME=

# Do not change
HUB_PRODUCT_NAME=BLACK_DUCK
HUB_VERSION=2023.7.2
HUB_VERSION=2023.10.0

# Specify any property-specific overrides here
#
Expand Down Expand Up @@ -111,9 +111,8 @@ BLACKDUCK_REDIS_SENTINEL_PARALLEL_SYNCS=1
# RabbitMQ Configuration
RABBITMQ_CTL_ERL_ARGS=-proto_dist inet_tls

# Minimum and default Detect major version for Detect version management.
BLACKDUCK_DETECT_MAJOR_VERSION_MIN=7
BLACKDUCK_DETECT_MAJOR_VERSION_DEFAULT=8
# Minimum major version for Detect version management.
BLACKDUCK_DETECT_MAJOR_VERSION_MIN=8

# pass-thru ev for toggling JSON structured logging
STRUCTURED_LOGGING
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.bdba.yml
Expand Up @@ -5,7 +5,7 @@ version: '3.6'

services:
binaryscanner:
image: sigsynopsys/bdba-worker:2023.6.0
image: sigsynopsys/bdba-worker:2023.9.4
env_file: [hub-bdba.env]
entrypoint: /docker-entrypoint.sh
healthcheck:
Expand Down
8 changes: 4 additions & 4 deletions docker-swarm/docker-compose.dbmigrate.yml
@@ -1,7 +1,7 @@
version: '3.6'
services:
cfssl:
image: blackducksoftware/blackduck-cfssl:1.0.20
image: blackducksoftware/blackduck-cfssl:1.0.23
volumes:
- cert-volume:/etc/cfssl
healthcheck:
Expand All @@ -12,7 +12,7 @@ services:
user: 'cfssl:root'

logstash:
image: blackducksoftware/blackduck-logstash:1.0.32
image: blackducksoftware/blackduck-logstash:1.0.34
volumes:
- log-volume:/var/lib/logstash/data
healthcheck:
Expand All @@ -23,7 +23,7 @@ services:
user: 'logstash:root'

postgres:
image: blackducksoftware/blackduck-postgres:13-2.28
image: blackducksoftware/blackduck-postgres:14-1.16
volumes:
- postgres96-data-volume:/bitnami/postgresql
- postgres-conf-volume:/opt/bitnami/postgresql/conf
Expand All @@ -41,7 +41,7 @@ services:
condition: on-failure

postgres-upgrader:
image: blackducksoftware/blackduck-postgres-upgrader:13-1.15
image: blackducksoftware/blackduck-postgres-upgrader:14-1.1
volumes:
- postgres96-data-volume:/bitnami/postgresql
- postgres-conf-volume:/opt/bitnami/postgresql/conf
Expand Down
32 changes: 16 additions & 16 deletions docker-swarm/docker-compose.externaldb.ubi.yml
Expand Up @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period
services:
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-authentication:2023.10.0_ubi8.8
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -35,7 +35,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-webapp:2023.10.0_ubi8.8
volumes:
- log-volume:/opt/blackduck/hub/logs
- {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security}
Expand All @@ -57,7 +57,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-scan:2023.10.0_ubi8.8
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 @@ -78,7 +78,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
storage:
user: storage:root
image: blackducksoftware/blackduck-storage:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-storage:2023.10.0_ubi8.8
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 @@ -100,7 +100,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-jobrunner:2023.10.0_ubi8.8
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness',
Expand All @@ -124,7 +124,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
cfssl:
image: blackducksoftware/blackduck-cfssl:1.0.20_ubi8.8
image: blackducksoftware/blackduck-cfssl:1.0.23_ubi8.8
volumes: ['cert-volume:/etc/cfssl']
env_file: [blackduck-config.env]
healthcheck:
Expand All @@ -137,7 +137,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
logstash:
image: blackducksoftware/blackduck-logstash:1.0.32_ubi8.8
image: blackducksoftware/blackduck-logstash:1.0.34_ubi8.8
volumes: ['log-volume:/var/lib/logstash/data']
env_file: [blackduck-config.env]
healthcheck:
Expand All @@ -152,7 +152,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
registration:
image: blackducksoftware/blackduck-registration:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-registration:2023.10.0_ubi8.8
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand All @@ -173,7 +173,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
webserver:
image: blackducksoftware/blackduck-nginx:2.0.48_ubi8.8
image: blackducksoftware/blackduck-nginx:2.0.60_ubi8.8
ports: ['443:8443']
env_file: [hub-webserver.env, blackduck-config.env]
environment:
Expand All @@ -191,7 +191,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 15s, window: 60s}
webui:
image: blackducksoftware/blackduck-webui:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-webui:2023.10.0_ubi8.8
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 @@ -206,7 +206,7 @@ services:
restart_policy: {condition: on-failure, delay: 15s, window: 60s}

documentation:
image: blackducksoftware/blackduck-documentation:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-documentation:2023.10.0_ubi8.8
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand All @@ -223,7 +223,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
uploadcache:
image: blackducksoftware/blackduck-upload-cache:1.0.45_ubi8.8
image: blackducksoftware/blackduck-upload-cache:1.0.48_ubi8.8
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -241,7 +241,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
redis:
image: blackducksoftware/blackduck-redis:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-redis:2023.10.0_ubi8.8
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -260,7 +260,7 @@ services:
deploy:
restart_policy: {condition: any}
bomengine:
image: blackducksoftware/blackduck-bomengine:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-bomengine:2023.10.0_ubi8.8
env_file: [blackduck-config.env , hub-postgres.env]
environment:
<< : *pg-usage-settings
Expand All @@ -281,7 +281,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
matchengine:
image: blackducksoftware/blackduck-matchengine:2023.7.2_ubi8.8
image: blackducksoftware/blackduck-matchengine:2023.10.0_ubi8.8
user: matchengine:root
healthcheck:
test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand All @@ -302,7 +302,7 @@ services:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
SYNOPSYS_CRYPTO_PROFILE: 'SWARM'
rabbitmq:
image: blackducksoftware/rabbitmq:1.2.29_ubi8.8
image: blackducksoftware/rabbitmq:1.2.32_ubi8.8
hostname: rabbitmq
volumes:
- rabbitmq-data-volume:/var/lib/rabbitmq
Expand Down

0 comments on commit e11a13a

Please sign in to comment.