diff --git a/README.md b/README.md index da6d045..0520c77 100644 --- 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 2023.4.1 archive: +## Location of Black Duck 2023.4.2 archive: -https://github.com/blackducksoftware/hub/archive/v2023.4.1.tar.gz +https://github.com/blackducksoftware/hub/archive/v2023.4.2.tar.gz NOTE: diff --git a/docker-swarm/bin/hub_add_replication_user.sh b/docker-swarm/bin/hub_add_replication_user.sh index c57f7f7..33699f4 100755 --- a/docker-swarm/bin/hub_add_replication_user.sh +++ b/docker-swarm/bin/hub_add_replication_user.sh @@ -3,7 +3,7 @@ set -e TIMEOUT=${TIMEOUT:-10} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.24} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.26} HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} function fail() { diff --git a/docker-swarm/bin/hub_create_data_dump.sh b/docker-swarm/bin/hub_create_data_dump.sh index 02cde99..55d889d 100755 --- a/docker-swarm/bin/hub_create_data_dump.sh +++ b/docker-swarm/bin/hub_create_data_dump.sh @@ -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.24} -HUB_VERSION=${HUB_VERSION:-2023.4.1} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.26} +HUB_VERSION=${HUB_VERSION:-2023.4.2} OPT_FORCE= OPT_LIVE_SYSTEM= OPT_MAX_CPU=${MAX_CPU:-1} diff --git a/docker-swarm/bin/hub_db_migrate.sh b/docker-swarm/bin/hub_db_migrate.sh index 5270034..2ab1abd 100755 --- a/docker-swarm/bin/hub_db_migrate.sh +++ b/docker-swarm/bin/hub_db_migrate.sh @@ -14,7 +14,7 @@ set -o errexit HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.24} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.26} OPT_MAX_CPU=${MAX_CPU:-1} OPT_NO_DATABASE=${NO_DATABASE:-} OPT_NO_STORAGE=${NO_STORAGE:-} diff --git a/docker-swarm/bin/hub_replication_changepassword.sh b/docker-swarm/bin/hub_replication_changepassword.sh index 4e2dee9..2a90d1f 100755 --- a/docker-swarm/bin/hub_replication_changepassword.sh +++ b/docker-swarm/bin/hub_replication_changepassword.sh @@ -3,7 +3,7 @@ set -e TIMEOUT=${TIMEOUT:-10} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.24} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.26} HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} function fail() { diff --git a/docker-swarm/bin/hub_reportdb_changepassword.sh b/docker-swarm/bin/hub_reportdb_changepassword.sh index 0a11aaa..10cec83 100755 --- a/docker-swarm/bin/hub_reportdb_changepassword.sh +++ b/docker-swarm/bin/hub_reportdb_changepassword.sh @@ -3,7 +3,7 @@ set -e TIMEOUT=${TIMEOUT:-10} -HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.24} +HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-13-2.26} HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres} function fail() { diff --git a/docker-swarm/bin/system_check.sh b/docker-swarm/bin/system_check.sh index d76b812..3e87115 100755 --- 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:-2023.4.1}" +readonly HUB_VERSION="${HUB_VERSION:-2023.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}" diff --git a/docker-swarm/blackduck-config.env b/docker-swarm/blackduck-config.env index 81927c4..7647e64 100644 --- a/docker-swarm/blackduck-config.env +++ b/docker-swarm/blackduck-config.env @@ -24,7 +24,7 @@ BLACKDUCK_CORS_ALLOW_CREDENTIALS_PROP_NAME= # Do not change HUB_PRODUCT_NAME=BLACK_DUCK -HUB_VERSION=2023.4.1 +HUB_VERSION=2023.4.2 # Specify any property-specific overrides here # diff --git a/docker-swarm/docker-compose.dbmigrate.yml b/docker-swarm/docker-compose.dbmigrate.yml index f4f11ea..fc50e85 100644 --- a/docker-swarm/docker-compose.dbmigrate.yml +++ b/docker-swarm/docker-compose.dbmigrate.yml @@ -23,7 +23,7 @@ services: user: 'logstash:root' postgres: - image: blackducksoftware/blackduck-postgres:13-2.24 + image: blackducksoftware/blackduck-postgres:13-2.26 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf @@ -41,7 +41,7 @@ services: condition: on-failure postgres-upgrader: - image: blackducksoftware/blackduck-postgres-upgrader:13-1.11 + image: blackducksoftware/blackduck-postgres-upgrader:13-1.14 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf diff --git a/docker-swarm/docker-compose.externaldb.ubi.yml b/docker-swarm/docker-compose.externaldb.ubi.yml index ec4784f..9ee265a 100644 --- a/docker-swarm/docker-compose.externaldb.ubi.yml +++ b/docker-swarm/docker-compose.externaldb.ubi.yml @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period services: authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-authentication:2023.4.2_ubi8.7 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -35,7 +35,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-webapp:2023.4.2_ubi8.7 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -57,7 +57,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-scan:2023.4.2_ubi8.7 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -78,7 +78,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-storage:2023.4.2_ubi8.7 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -100,7 +100,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-jobrunner:2023.4.2_ubi8.7 env_file: [blackduck-config.env , hub-postgres.env] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -152,7 +152,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-registration:2023.4.2_ubi8.7 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -191,7 +191,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-webui:2023.4.2_ubi8.7 healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', /opt/blackduck/hub/hub-ui/security/root.crt] @@ -206,7 +206,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-documentation:2023.4.2_ubi8.7 env_file: [blackduck-config.env] user: documentation:root environment: @@ -223,7 +223,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} uploadcache: - image: blackducksoftware/blackduck-upload-cache:1.0.41_ubi8.7 + image: blackducksoftware/blackduck-upload-cache:1.0.44_ubi8.7 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -241,7 +241,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-redis:2023.4.2_ubi8.7 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -260,7 +260,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-bomengine:2023.4.2_ubi8.7 env_file: [blackduck-config.env , hub-postgres.env] environment: << : *pg-usage-settings @@ -281,7 +281,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-matchengine:2023.4.2_ubi8.7 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.externaldb.yml b/docker-swarm/docker-compose.externaldb.yml index 621523c..d325c6e 100644 --- a/docker-swarm/docker-compose.externaldb.yml +++ b/docker-swarm/docker-compose.externaldb.yml @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period services: authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.4.1 + image: blackducksoftware/blackduck-authentication:2023.4.2 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -35,7 +35,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.4.1 + image: blackducksoftware/blackduck-webapp:2023.4.2 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -57,7 +57,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.4.1 + image: blackducksoftware/blackduck-scan:2023.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', @@ -78,7 +78,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.4.1 + image: blackducksoftware/blackduck-storage:2023.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', @@ -100,7 +100,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.4.1 + image: blackducksoftware/blackduck-jobrunner:2023.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', @@ -152,7 +152,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.4.1 + image: blackducksoftware/blackduck-registration:2023.4.2 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -191,7 +191,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.4.1 + image: blackducksoftware/blackduck-webui:2023.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] @@ -206,7 +206,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.4.1 + image: blackducksoftware/blackduck-documentation:2023.4.2 env_file: [blackduck-config.env] user: documentation:root environment: @@ -223,7 +223,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} uploadcache: - image: blackducksoftware/blackduck-upload-cache:1.0.41 + image: blackducksoftware/blackduck-upload-cache:1.0.44 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -241,7 +241,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.4.1 + image: blackducksoftware/blackduck-redis:2023.4.2 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -260,7 +260,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.4.1 + image: blackducksoftware/blackduck-bomengine:2023.4.2 env_file: [blackduck-config.env , hub-postgres.env] environment: << : *pg-usage-settings @@ -281,7 +281,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.4.1 + image: blackducksoftware/blackduck-matchengine:2023.4.2 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 index 461a108..c14c968 100644 --- 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:2023.4.1 + image: blackducksoftware/blackduck-redis:2023.4.2 env_file: [blackduck-config.env] user: redis:root stop_grace_period: 60s @@ -25,7 +25,7 @@ services: limits: {memory: 2048M} reservations: {memory: 2048M} redissentinel1: - image: blackducksoftware/blackduck-redis:2023.4.1 + image: blackducksoftware/blackduck-redis:2023.4.2 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:2023.4.1 + image: blackducksoftware/blackduck-redis:2023.4.2 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:2023.4.1 + image: blackducksoftware/blackduck-redis:2023.4.2 env_file: [blackduck-config.env] hostname: redissentinel3 user: redis:root diff --git a/docker-swarm/docker-compose.ubi.yml b/docker-swarm/docker-compose.ubi.yml index 85ae9fc..f5da070 100644 --- a/docker-swarm/docker-compose.ubi.yml +++ b/docker-swarm/docker-compose.ubi.yml @@ -12,7 +12,7 @@ x-long-start-period: &long-start-period services: postgres: - image: blackducksoftware/blackduck-postgres:13-2.24_ubi8.7 + image: blackducksoftware/blackduck-postgres:13-2.26_ubi8.7 ports: ['55436:5432'] volumes: - postgres96-data-volume:/bitnami/postgresql @@ -30,7 +30,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} stop_grace_period: 60s postgres-upgrader: - image: blackducksoftware/blackduck-postgres-upgrader:13-1.11_ubi8.7 + image: blackducksoftware/blackduck-postgres-upgrader:13-1.14_ubi8.7 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf @@ -45,7 +45,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-authentication:2023.4.2_ubi8.7 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -67,7 +67,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-webapp:2023.4.2_ubi8.7 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -89,7 +89,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-scan:2023.4.2_ubi8.7 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -110,7 +110,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-storage:2023.4.2_ubi8.7 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -132,7 +132,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-jobrunner:2023.4.2_ubi8.7 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -184,7 +184,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-registration:2023.4.2_ubi8.7 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -223,7 +223,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-webui:2023.4.2_ubi8.7 healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', /opt/blackduck/hub/hub-ui/security/root.crt] @@ -238,7 +238,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-documentation:2023.4.2_ubi8.7 env_file: [blackduck-config.env] user: documentation:root environment: @@ -255,7 +255,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} uploadcache: - image: blackducksoftware/blackduck-upload-cache:1.0.41_ubi8.7 + image: blackducksoftware/blackduck-upload-cache:1.0.44_ubi8.7 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -273,7 +273,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-redis:2023.4.2_ubi8.7 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -292,7 +292,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-bomengine:2023.4.2_ubi8.7 env_file: [blackduck-config.env ] environment: << : *pg-usage-settings @@ -313,7 +313,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.4.1_ubi8.7 + image: blackducksoftware/blackduck-matchengine:2023.4.2_ubi8.7 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.yml b/docker-swarm/docker-compose.yml index 2aebd44..58fd098 100644 --- a/docker-swarm/docker-compose.yml +++ b/docker-swarm/docker-compose.yml @@ -12,7 +12,7 @@ x-long-start-period: &long-start-period services: postgres: - image: blackducksoftware/blackduck-postgres:13-2.24 + image: blackducksoftware/blackduck-postgres:13-2.26 ports: ['55436:5432'] volumes: - postgres96-data-volume:/bitnami/postgresql @@ -30,7 +30,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} stop_grace_period: 60s postgres-upgrader: - image: blackducksoftware/blackduck-postgres-upgrader:13-1.11 + image: blackducksoftware/blackduck-postgres-upgrader:13-1.14 volumes: - postgres96-data-volume:/bitnami/postgresql - postgres-conf-volume:/opt/bitnami/postgresql/conf @@ -45,7 +45,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} authentication: user: authentication:root - image: blackducksoftware/blackduck-authentication:2023.4.1 + image: blackducksoftware/blackduck-authentication:2023.4.2 volumes: - authentication-volume:/opt/blackduck/hub/hub-authentication/ldap - {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security} @@ -67,7 +67,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} webapp: user: webapp:root - image: blackducksoftware/blackduck-webapp:2023.4.1 + image: blackducksoftware/blackduck-webapp:2023.4.2 volumes: - log-volume:/opt/blackduck/hub/logs - {type: tmpfs, target: /opt/blackduck/hub/hub-webapp/security} @@ -89,7 +89,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} scan: user: scan:root - image: blackducksoftware/blackduck-scan:2023.4.1 + image: blackducksoftware/blackduck-scan:2023.4.2 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -110,7 +110,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} storage: user: storage:root - image: blackducksoftware/blackduck-storage:2023.4.1 + image: blackducksoftware/blackduck-storage:2023.4.2 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness', @@ -132,7 +132,7 @@ services: restart_policy: {condition: on-failure, delay: 5s, window: 60s} jobrunner: user: jobrunner:root - image: blackducksoftware/blackduck-jobrunner:2023.4.1 + image: blackducksoftware/blackduck-jobrunner:2023.4.2 env_file: [blackduck-config.env ] healthcheck: test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/health-checks/liveness', @@ -184,7 +184,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} registration: - image: blackducksoftware/blackduck-registration:2023.4.1 + image: blackducksoftware/blackduck-registration:2023.4.2 volumes: - config-volume:/opt/blackduck/hub/hub-registration/config - {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security} @@ -223,7 +223,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 15s, window: 60s} webui: - image: blackducksoftware/blackduck-webui:2023.4.1 + image: blackducksoftware/blackduck-webui:2023.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] @@ -238,7 +238,7 @@ services: restart_policy: {condition: on-failure, delay: 15s, window: 60s} documentation: - image: blackducksoftware/blackduck-documentation:2023.4.1 + image: blackducksoftware/blackduck-documentation:2023.4.2 env_file: [blackduck-config.env] user: documentation:root environment: @@ -255,7 +255,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} uploadcache: - image: blackducksoftware/blackduck-upload-cache:1.0.41 + image: blackducksoftware/blackduck-upload-cache:1.0.44 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -273,7 +273,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} redis: - image: blackducksoftware/blackduck-redis:2023.4.1 + image: blackducksoftware/blackduck-redis:2023.4.2 env_file: [blackduck-config.env] environment: HUB_JOBRUNNER_HOST: 'tasks.jobrunner.' @@ -292,7 +292,7 @@ services: deploy: restart_policy: {condition: any} bomengine: - image: blackducksoftware/blackduck-bomengine:2023.4.1 + image: blackducksoftware/blackduck-bomengine:2023.4.2 env_file: [blackduck-config.env ] environment: << : *pg-usage-settings @@ -313,7 +313,7 @@ services: mode: replicated restart_policy: {condition: on-failure, delay: 5s, window: 60s} matchengine: - image: blackducksoftware/blackduck-matchengine:2023.4.1 + image: blackducksoftware/blackduck-matchengine:2023.4.2 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/getting_started.pdf b/docs/en_US/getting_started.pdf index 99dc0e9..5d8b47e 100644 Binary files a/docs/en_US/getting_started.pdf and b/docs/en_US/getting_started.pdf differ diff --git a/docs/en_US/install_kubernetes.pdf b/docs/en_US/install_kubernetes.pdf index d5aa49f..1c05cf5 100644 Binary files a/docs/en_US/install_kubernetes.pdf and b/docs/en_US/install_kubernetes.pdf differ diff --git a/docs/en_US/install_openshift.pdf b/docs/en_US/install_openshift.pdf index c2060f4..7fe0922 100644 Binary files a/docs/en_US/install_openshift.pdf and b/docs/en_US/install_openshift.pdf differ diff --git a/docs/en_US/install_swarm.pdf b/docs/en_US/install_swarm.pdf index 7097832..e72e8c0 100644 Binary files a/docs/en_US/install_swarm.pdf and b/docs/en_US/install_swarm.pdf differ diff --git a/docs/en_US/release_notes.pdf b/docs/en_US/release_notes.pdf index 53a5acb..1d8c4ed 100644 Binary files a/docs/en_US/release_notes.pdf and b/docs/en_US/release_notes.pdf differ diff --git a/docs/ja_JA/getting_started.pdf b/docs/ja_JA/getting_started.pdf index a9de903..dada6aa 100644 Binary files a/docs/ja_JA/getting_started.pdf and b/docs/ja_JA/getting_started.pdf differ diff --git a/docs/ja_JA/install_kubernetes.pdf b/docs/ja_JA/install_kubernetes.pdf index 24f7b4e..25f6f74 100644 Binary files a/docs/ja_JA/install_kubernetes.pdf and b/docs/ja_JA/install_kubernetes.pdf differ diff --git a/docs/ja_JA/install_openshift.pdf b/docs/ja_JA/install_openshift.pdf index 98ae5f0..ec0f32d 100644 Binary files a/docs/ja_JA/install_openshift.pdf and b/docs/ja_JA/install_openshift.pdf differ diff --git a/docs/ja_JA/install_swarm.pdf b/docs/ja_JA/install_swarm.pdf index 319216b..112cc1e 100644 Binary files a/docs/ja_JA/install_swarm.pdf and b/docs/ja_JA/install_swarm.pdf differ diff --git a/docs/ja_JA/release_notes.pdf b/docs/ja_JA/release_notes.pdf index afb54a0..a41f2a7 100644 Binary files a/docs/ja_JA/release_notes.pdf and b/docs/ja_JA/release_notes.pdf differ diff --git a/docs/zh_CN/getting_started.pdf b/docs/zh_CN/getting_started.pdf index 52b56cf..cd966dd 100644 Binary files a/docs/zh_CN/getting_started.pdf and b/docs/zh_CN/getting_started.pdf differ diff --git a/docs/zh_CN/install_kubernetes.pdf b/docs/zh_CN/install_kubernetes.pdf index c809dad..96249d1 100644 Binary files a/docs/zh_CN/install_kubernetes.pdf and b/docs/zh_CN/install_kubernetes.pdf differ diff --git a/docs/zh_CN/install_openshift.pdf b/docs/zh_CN/install_openshift.pdf index 391eb2b..9a7fa4c 100644 Binary files a/docs/zh_CN/install_openshift.pdf and b/docs/zh_CN/install_openshift.pdf differ diff --git a/docs/zh_CN/install_swarm.pdf b/docs/zh_CN/install_swarm.pdf index c41babd..0e92492 100644 Binary files a/docs/zh_CN/install_swarm.pdf and b/docs/zh_CN/install_swarm.pdf differ diff --git a/docs/zh_CN/release_notes.pdf b/docs/zh_CN/release_notes.pdf index 500ca55..e8a2fd6 100644 Binary files a/docs/zh_CN/release_notes.pdf and b/docs/zh_CN/release_notes.pdf differ diff --git a/kubernetes/blackduck/Chart.yaml b/kubernetes/blackduck/Chart.yaml index e874690..41f8580 100644 --- a/kubernetes/blackduck/Chart.yaml +++ b/kubernetes/blackduck/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 2023.4.1 +appVersion: 2023.4.2 name: blackduck description: Black Duck Helm Chart -version: 2023.4.1 +version: 2023.4.2 diff --git a/kubernetes/blackduck/README.md b/kubernetes/blackduck/README.md index 62ca073..e4a23f2 100644 --- a/kubernetes/blackduck/README.md +++ b/kubernetes/blackduck/README.md @@ -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 | `2023.4.1` | +| `imageTag` | Version of Black Duck | `2023.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) | | @@ -537,7 +537,7 @@ storage: | Parameter | Description | Default | | --------- | ----------- | ------- | | `uploadcache.registry` | Image repository to be override at container level | | -| `uploadcache.imageTag` | Image tag to be override at container level | `1.0.41` | +| `uploadcache.imageTag` | Image tag to be override at container level | `1.0.44` | | `uploadcache.resources.limits.memory` | Upload cache container Memory Limit | `512Mi` | | `uploadcache.resources.requests.memory` | Upload cache container Memory request | `512Mi` | | `uploadcache.persistentVolumeClaimName` | Point to an existing Upload cache Persistent Volume Claim (PVC) | | diff --git a/kubernetes/blackduck/values.ubi.yaml b/kubernetes/blackduck/values.ubi.yaml index 36a1ed2..8134c03 100644 --- a/kubernetes/blackduck/values.ubi.yaml +++ b/kubernetes/blackduck/values.ubi.yaml @@ -8,7 +8,7 @@ fullnameOverride: isKubernetes: true isAzure: false -imageTag: "2023.4.1" +imageTag: "2023.4.2" # Docker registry to pull Black Duck images registry: docker.io/blackducksoftware @@ -172,7 +172,7 @@ postgres: podSecurityContext: {} securityContext: {} resources: {} - imageTag: 13-2.24_ubi8.7 + imageTag: 13-2.26_ubi8.7 ### Postgres main data volume # pvc related parameters for postgres container. set if you want to create your own PVC persistentVolumeClaimName: @@ -200,7 +200,7 @@ postgresUpgrader: securityContext: {} podSecurityContext: {} resources: {} - imageTag: 13-1.11_ubi8.7 + imageTag: 13-1.14_ubi8.7 imagePullPolicy: IfNotPresent postgresWaiter: @@ -227,7 +227,7 @@ authentication: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 # pvc related parameters for authentication container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -274,7 +274,7 @@ bomengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 dbPoolMaxActive: affinity: {} nodeSelector: {} @@ -314,7 +314,7 @@ documentation: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 nodeSelector: {} tolerations: [] affinity: {} @@ -330,7 +330,7 @@ jobrunner: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -373,7 +373,7 @@ redis: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 tlsEnabled: false maxTotal: 128 maxIdle: 128 @@ -393,7 +393,7 @@ registration: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 # pvc related parameters for registration container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -421,7 +421,7 @@ scan: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -439,7 +439,7 @@ storage: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 # PVC related parameters for storage cache container. # If you want to use already existing persistance volume for blackduck tools & reports storage, use this option to configure the existing pvc name. persistentVolumeClaimName: @@ -466,7 +466,7 @@ uploadcache: # override the docker registry at container level registry: # override the global imageTag - imageTag: 1.0.41_ubi8.7 + imageTag: 1.0.44_ubi8.7 # pvc related parameters for upload cache container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -490,7 +490,7 @@ webapp: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 # pvc related parameters for webapp container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -552,7 +552,7 @@ webserver: webui: # override the docker registry at container level registry: - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 nodeSelector: {} tolerations: [] affinity: {} @@ -578,7 +578,7 @@ matchengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1_ubi8.7 + imageTag: 2023.4.2_ubi8.7 dbPoolMaxActive: nodeSelector: {} tolerations: [] diff --git a/kubernetes/blackduck/values.yaml b/kubernetes/blackduck/values.yaml index f4087b7..dbc9ae9 100644 --- a/kubernetes/blackduck/values.yaml +++ b/kubernetes/blackduck/values.yaml @@ -8,7 +8,7 @@ fullnameOverride: isKubernetes: true isAzure: false -imageTag: "2023.4.1" +imageTag: "2023.4.2" # Docker registry to pull Black Duck images registry: docker.io/blackducksoftware @@ -172,7 +172,7 @@ postgres: podSecurityContext: {} securityContext: {} resources: {} - imageTag: 13-2.24 + imageTag: 13-2.26 ### Postgres main data volume # pvc related parameters for postgres container. set if you want to create your own PVC persistentVolumeClaimName: @@ -200,7 +200,7 @@ postgresUpgrader: securityContext: {} podSecurityContext: {} resources: {} - imageTag: 13-1.11 + imageTag: 13-1.14 imagePullPolicy: IfNotPresent postgresWaiter: @@ -227,7 +227,7 @@ authentication: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 # pvc related parameters for authentication container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -274,7 +274,7 @@ bomengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 dbPoolMaxActive: affinity: {} nodeSelector: {} @@ -314,7 +314,7 @@ documentation: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 nodeSelector: {} tolerations: [] affinity: {} @@ -330,7 +330,7 @@ jobrunner: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -373,7 +373,7 @@ redis: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 tlsEnabled: false maxTotal: 128 maxIdle: 128 @@ -393,7 +393,7 @@ registration: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 # pvc related parameters for registration container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -421,7 +421,7 @@ scan: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 dbPoolMaxActive: nodeSelector: {} tolerations: [] @@ -439,7 +439,7 @@ storage: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 # PVC related parameters for storage cache container. # If you want to use already existing persistance volume for blackduck tools & reports storage, use this option to configure the existing pvc name. persistentVolumeClaimName: @@ -466,7 +466,7 @@ uploadcache: # override the docker registry at container level registry: # override the global imageTag - imageTag: 1.0.41 + imageTag: 1.0.44 # pvc related parameters for upload cache container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -490,7 +490,7 @@ webapp: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 # pvc related parameters for webapp container. set if you want to create your own PVC (used for migration) persistentVolumeClaimName: # PVC claim size @@ -552,7 +552,7 @@ webserver: webui: # override the docker registry at container level registry: - imageTag: 2023.4.1 + imageTag: 2023.4.2 nodeSelector: {} tolerations: [] affinity: {} @@ -578,7 +578,7 @@ matchengine: # override the docker registry at container level registry: # override the global imageTag - imageTag: 2023.4.1 + imageTag: 2023.4.2 dbPoolMaxActive: nodeSelector: {} tolerations: []