Skip to content

Commit

Permalink
Release 2020.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Builder Service committed Aug 11, 2020
1 parent 5455563 commit 491ed1f
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 20 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 2020.6.1 archive:
## Location of Black Duck 2020.6.2 archive:

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

## Important Upgrade Announcement

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 @@ -34,7 +34,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:-2020.6.1}"
readonly HUB_VERSION="${HUB_VERSION:-2020.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 @@ -21,7 +21,7 @@ BLACKDUCK_CORS_ALLOWED_HEADERS_PROP_NAME=
BLACKDUCK_CORS_EXPOSED_HEADERS_PROP_NAME=

# Do not change
HUB_VERSION=2020.6.1
HUB_VERSION=2020.6.2

# Specify any property-specific overrides here
#
Expand Down
12 changes: 6 additions & 6 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:2020.6.1
image: blackducksoftware/blackduck-authentication:2020.6.2
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -28,7 +28,7 @@ services:
reservations: {memory: 1024M}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2020.6.1
image: blackducksoftware/blackduck-webapp:2020.6.2
volumes:
- log-volume:/opt/blackduck/hub/logs
- webapp-volume:/opt/blackduck/hub/hub-webapp/ldap
Expand All @@ -51,7 +51,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2020.6.1
image: blackducksoftware/blackduck-scan:2020.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 @@ -72,7 +72,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2020.6.1
image: blackducksoftware/blackduck-jobrunner:2020.6.2
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh]
Expand Down Expand Up @@ -123,7 +123,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
registration:
image: blackducksoftware/blackduck-registration:2020.6.1
image: blackducksoftware/blackduck-registration:2020.6.2
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -162,7 +162,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
documentation:
image: blackducksoftware/blackduck-documentation:2020.6.1
image: blackducksoftware/blackduck-documentation:2020.6.2
env_file: [blackduck-config.env]
user: documentation:root
healthcheck:
Expand Down
12 changes: 6 additions & 6 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:2020.6.1
image: blackducksoftware/blackduck-authentication:2020.6.2
volumes:
- authentication-volume:/opt/blackduck/hub/hub-authentication/ldap
- {type: tmpfs, target: /opt/blackduck/hub/hub-authentication/security}
Expand All @@ -46,7 +46,7 @@ services:
reservations: {memory: 1024M}
webapp:
user: webapp:root
image: blackducksoftware/blackduck-webapp:2020.6.1
image: blackducksoftware/blackduck-webapp:2020.6.2
volumes:
- log-volume:/opt/blackduck/hub/logs
- webapp-volume:/opt/blackduck/hub/hub-webapp/ldap
Expand All @@ -69,7 +69,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
scan:
user: scan:root
image: blackducksoftware/blackduck-scan:2020.6.1
image: blackducksoftware/blackduck-scan:2020.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 @@ -90,7 +90,7 @@ services:
reservations: {cpus: '1', memory: 2560M}
jobrunner:
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2020.6.1
image: blackducksoftware/blackduck-jobrunner:2020.6.2
env_file: [blackduck-config.env ]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh]
Expand Down Expand Up @@ -141,7 +141,7 @@ services:
limits: {memory: 1024M}
reservations: {memory: 1024M}
registration:
image: blackducksoftware/blackduck-registration:2020.6.1
image: blackducksoftware/blackduck-registration:2020.6.2
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -180,7 +180,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
documentation:
image: blackducksoftware/blackduck-documentation:2020.6.1
image: blackducksoftware/blackduck-documentation:2020.6.2
env_file: [blackduck-config.env]
user: documentation:root
healthcheck:
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: 2020.6.1
appVersion: 2020.6.2
name: blackduck
description: Black Duck Helm Chart
version: 2020.6.1
version: 2020.6.2
2 changes: 1 addition & 1 deletion kubernetes/blackduck/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,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 | `2020.6.1` |
| `imageTag` | Version of Black Duck | `2020.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
2 changes: 1 addition & 1 deletion kubernetes/blackduck/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ fullnameOverride:

isKubernetes: true

imageTag: "2020.6.1"
imageTag: "2020.6.2"

# Docker registry to pull Black Duck images
registry: docker.io/blackducksoftware
Expand Down

0 comments on commit 491ed1f

Please sign in to comment.