Skip to content

Commit

Permalink
Release 2024.7.2
Browse files Browse the repository at this point in the history
  • Loading branch information
blackduck-serv-builder committed Oct 3, 2024
1 parent c96d9c3 commit 83c955d
Show file tree
Hide file tree
Showing 32 changed files with 178 additions and 97 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 2024.7.1 archive:
## Location of Black Duck 2024.7.2 archive:

https://github.com/blackducksoftware/hub/archive/v2024.7.1.tar.gz
https://github.com/blackducksoftware/hub/archive/v2024.7.2.tar.gz

NOTE:

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 @@ -6,7 +6,7 @@

HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
HUB_POSTGRES_VERSION=${HUB_POSTGRES_VERSION:-14-1.25}
HUB_VERSION=${HUB_VERSION:-2024.7.1}
HUB_VERSION=${HUB_VERSION:-2024.7.2}
OPT_FORCE=
OPT_LIVE_SYSTEM=
OPT_MAX_CPU=${MAX_CPU:-1}
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:-2024.7.1}"
readonly HUB_VERSION="${HUB_VERSION:-2024.7.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=2024.7.1
HUB_VERSION=2024.7.2

# Specify any property-specific overrides here
#
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.dbmigrate.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.6'
services:
cfssl:
image: blackducksoftware/blackduck-cfssl:1.0.28
image: blackducksoftware/blackduck-cfssl:1.0.29
volumes:
- cert-volume:/etc/cfssl
healthcheck:
Expand Down
24 changes: 12 additions & 12 deletions docker-swarm/docker-compose.externaldb.ubi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period
services:
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-authentication:2024.7.2_ubi9.3
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-webapp:2024.7.2_ubi9.3
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-scan:2024.7.2_ubi9.3
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-storage:2024.7.2_ubi9.3
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-jobrunner:2024.7.2_ubi9.3
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.28_ubi9.3
image: blackducksoftware/blackduck-cfssl:1.0.29_ubi9.3
volumes: ['cert-volume:/etc/cfssl']
env_file: [blackduck-config.env]
healthcheck:
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-registration:2024.7.2_ubi9.3
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-nginx:2024.7.2_ubi9.3
ports: ['443:8443']
env_file: [hub-webserver.env, blackduck-config.env]
environment:
Expand All @@ -192,7 +192,7 @@ services:
restart_policy: {condition: on-failure, delay: 15s, window: 60s}

documentation:
image: blackducksoftware/blackduck-documentation:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-documentation:2024.7.2_ubi9.3
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand All @@ -209,7 +209,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
redis:
image: blackducksoftware/blackduck-redis:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-redis:2024.7.2_ubi9.3
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -228,7 +228,7 @@ services:
deploy:
restart_policy: {condition: any}
bomengine:
image: blackducksoftware/blackduck-bomengine:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-bomengine:2024.7.2_ubi9.3
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:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-matchengine:2024.7.2_ubi9.3
user: matchengine:root
healthcheck:
test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand Down
24 changes: 12 additions & 12 deletions docker-swarm/docker-compose.externaldb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ x-long-start-period: &long-start-period
services:
authentication:
user: authentication:root
image: blackducksoftware/blackduck-authentication:2024.7.1
image: blackducksoftware/blackduck-authentication:2024.7.2
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:2024.7.1
image: blackducksoftware/blackduck-webapp:2024.7.2
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:2024.7.1
image: blackducksoftware/blackduck-scan:2024.7.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 @@ -78,7 +78,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
storage:
user: storage:root
image: blackducksoftware/blackduck-storage:2024.7.1
image: blackducksoftware/blackduck-storage:2024.7.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 @@ -100,7 +100,7 @@ services:
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2024.7.1
image: blackducksoftware/blackduck-jobrunner:2024.7.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 All @@ -124,7 +124,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
cfssl:
image: blackducksoftware/blackduck-cfssl:1.0.28
image: blackducksoftware/blackduck-cfssl:1.0.29
volumes: ['cert-volume:/etc/cfssl']
env_file: [blackduck-config.env]
healthcheck:
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:2024.7.1
image: blackducksoftware/blackduck-registration:2024.7.2
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:2024.7.1
image: blackducksoftware/blackduck-nginx:2024.7.2
ports: ['443:8443']
env_file: [hub-webserver.env, blackduck-config.env]
environment:
Expand All @@ -192,7 +192,7 @@ services:
restart_policy: {condition: on-failure, delay: 15s, window: 60s}

documentation:
image: blackducksoftware/blackduck-documentation:2024.7.1
image: blackducksoftware/blackduck-documentation:2024.7.2
env_file: [blackduck-config.env]
user: documentation:root
environment:
Expand All @@ -209,7 +209,7 @@ services:
mode: replicated
restart_policy: {condition: on-failure, delay: 5s, window: 60s}
redis:
image: blackducksoftware/blackduck-redis:2024.7.1
image: blackducksoftware/blackduck-redis:2024.7.2
env_file: [blackduck-config.env]
environment:
HUB_JOBRUNNER_HOST: 'tasks.jobrunner.'
Expand All @@ -228,7 +228,7 @@ services:
deploy:
restart_policy: {condition: any}
bomengine:
image: blackducksoftware/blackduck-bomengine:2024.7.1
image: blackducksoftware/blackduck-bomengine:2024.7.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:2024.7.1
image: blackducksoftware/blackduck-matchengine:2024.7.2
user: matchengine:root
healthcheck:
test: [ CMD, /usr/local/bin/docker-healthcheck.sh, 'https://localhost:8443/api/health-checks/liveness',
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.integration.externaldb.ubi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3.6'

services:
integration:
image: blackducksoftware/blackduck-integration:2024.7.1_ubi9.3
image: blackducksoftware/blackduck-integration:2024.7.2_ubi9.3
user: integration:root
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.integration.externaldb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3.6'

services:
integration:
image: blackducksoftware/blackduck-integration:2024.7.1
image: blackducksoftware/blackduck-integration:2024.7.2
user: integration:root
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/docker-compose.integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: '3.6'

services:
integration:
image: blackducksoftware/blackduck-integration:2024.7.1
image: blackducksoftware/blackduck-integration:2024.7.2
user: integration:root
env_file: [blackduck-config.env ]
healthcheck:
Expand Down
33 changes: 33 additions & 0 deletions docker-swarm/docker-compose.local-overrides.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,19 @@ version: '3.6'
# constraints:
# - node.labels.type == db
#authentication:
#secrets:
# - HUB_SERVICE_GENAI_OLD_PASSWORD_FILE
# - HUB_SERVICE_GENAI_CURRENT_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#webapp:
#environment:
# HUB_MAX_MEMORY: REPLACE_WITH_NEW_HUB_MAX_HEAP_MEMORYm
# HUB_MIN_MEMORY: REPLACE_WITH_NEW_HUB_MIN_HEAP_MEMORYm
#secrets:
# - HUB_PROXY_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#deploy:
# resources:
# limits: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
Expand All @@ -33,6 +40,8 @@ version: '3.6'
#scan:
#secrets:
# - HUB_PROXY_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#deploy:
# resources:
# limits: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
Expand All @@ -41,6 +50,8 @@ version: '3.6'
#storage:
#secrets:
# - HUB_PROXY_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#deploy:
# resources:
# limits: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
Expand All @@ -54,6 +65,8 @@ version: '3.6'
# HUB_MIN_MEMORY: REPLACE_WITH_NEW_HUB_MIN_HEAP_MEMORYm
#secrets:
# - HUB_PROXY_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#deploy:
# resources:
# limits: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
Expand Down Expand Up @@ -88,6 +101,8 @@ version: '3.6'
# HUB_MIN_MEMORY: REPLACE_WITH_NEW_HUB_MIN_HEAP_MEMORYm
#secrets:
# - HUB_PROXY_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#deploy:
# resources:
# limits: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
Expand All @@ -99,11 +114,17 @@ version: '3.6'
# HUB_MIN_MEMORY: REPLACE_WITH_NEW_HUB_MIN_HEAP_MEMORYm
#secrets:
# - HUB_PROXY_PASSWORD_FILE
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#deploy:
# resources:
# limits: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
# reservations: {cpus: 'REPLACE_WITH_NUM_CPUS', memory: REPLACE_WITH_NEW_MEM_LIMITm}
# replicas: REPLACE_WITH_NUM_REPLICAS
#integration:
#secrets:
# - JWT_PUBLIC_KEY
# - JWT_PRIVATE_KEY
#secrets:
# HUB_PROXY_PASSWORD_FILE:
# external: true
Expand All @@ -114,3 +135,15 @@ version: '3.6'
# WEBSERVER_CUSTOM_KEY_FILE:
# external: true
# name: "hub_WEBSERVER_CUSTOM_KEY_FILE"
# HUB_SERVICE_GENAI_OLD_PASSWORD_FILE:
# external: true
# name: "hub_SERVICE_GENAI_OLD_PASSWORD_FILE"
# HUB_SERVICE_GENAI_CURRENT_PASSWORD_FILE:
# external: true
# name: "hub_SERVICE_GENAI_CURRENT_PASSWORD_FILE"
# JWT_PUBLIC_KEY:
# external: true
# name: "hub_JWT_PUBLIC_KEY"
# JWT_PRIVATE_KEY:
# external: true
# name: "hub_JWT_PRIVATE_KEY"
Loading

0 comments on commit 83c955d

Please sign in to comment.