Skip to content

Commit

Permalink
Release 2019.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Builder Service committed Nov 21, 2019
1 parent c21a0a6 commit cb5ced8
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 50 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 2019.10.0 archive:
## Location of Black Duck 2019.10.1 archive:

https://github.com/blackducksoftware/hub/archive/v2019.10.0.tar.gz
https://github.com/blackducksoftware/hub/archive/v2019.10.1.tar.gz

## Important Upgrade Announcement

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/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:-2019.10.0}"
readonly HUB_VERSION="${HUB_VERSION:-2019.10.1}"
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-compose/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=2019.10.0
HUB_VERSION=2019.10.1

# Specify any property-specific overrides here
#
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/docker-compose.externaldb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
authentication:
links: [ cfssl, logstash, registration, zookeeper, webapp]
user: authentication:root
image: blackducksoftware/blackduck-authentication:2019.10.0
image: blackducksoftware/blackduck-authentication:2019.10.1
volumes: ['authentication-volume:/opt/blackduck/hub/hub-authentication/ldap' ,'secrets-volume:/run/secrets']
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
Expand All @@ -29,7 +29,7 @@ services:
webapp:
links: [ cfssl, logstash, registration, zookeeper]
user: webapp:root
image: blackducksoftware/blackduck-webapp:2019.10.0
image: blackducksoftware/blackduck-webapp:2019.10.1
volumes: ['log-volume:/opt/blackduck/hub/logs', 'webapp-volume:/opt/blackduck/hub/hub-webapp/ldap' ,'secrets-volume:/run/secrets']
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
Expand All @@ -47,7 +47,7 @@ services:
scan:
links: [ cfssl, logstash, registration, zookeeper]
user: scan:root
image: blackducksoftware/blackduck-scan:2019.10.0
image: blackducksoftware/blackduck-scan:2019.10.1
volumes: [ 'secrets-volume:/run/secrets' ]
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
Expand All @@ -65,7 +65,7 @@ services:
jobrunner:
links: [ cfssl, logstash, registration, zookeeper]
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2019.10.0
image: blackducksoftware/blackduck-jobrunner:2019.10.1
volumes: [ 'secrets-volume:/run/secrets' ]
env_file: [blackduck-config.env , hub-postgres.env]
healthcheck:
Expand Down Expand Up @@ -104,7 +104,7 @@ services:
restart: always
mem_limit: 1024m
registration:
image: blackducksoftware/blackduck-registration:2019.10.0
image: blackducksoftware/blackduck-registration:2019.10.1
links: [logstash, cfssl]
volumes: ['config-volume:/opt/blackduck/hub/hub-registration/config']
env_file: [blackduck-config.env]
Expand Down Expand Up @@ -148,7 +148,7 @@ services:
mem_limit: 640M
tmpfs: [/opt/blackduck/hub/webserver/security]
documentation:
image: blackducksoftware/blackduck-documentation:2019.10.0
image: blackducksoftware/blackduck-documentation:2019.10.1
links: [logstash]
env_file: [blackduck-config.env]
user: documentation:root
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
authentication:
links: [postgres, cfssl, logstash, registration, zookeeper, webapp]
user: authentication:root
image: blackducksoftware/blackduck-authentication:2019.10.0
image: blackducksoftware/blackduck-authentication:2019.10.1
volumes: ['authentication-volume:/opt/blackduck/hub/hub-authentication/ldap' ]
env_file: [blackduck-config.env ]
healthcheck:
Expand All @@ -44,7 +44,7 @@ services:
webapp:
links: [postgres, cfssl, logstash, registration, zookeeper]
user: webapp:root
image: blackducksoftware/blackduck-webapp:2019.10.0
image: blackducksoftware/blackduck-webapp:2019.10.1
volumes: ['log-volume:/opt/blackduck/hub/logs', 'webapp-volume:/opt/blackduck/hub/hub-webapp/ldap' ]
env_file: [blackduck-config.env ]
healthcheck:
Expand All @@ -62,7 +62,7 @@ services:
scan:
links: [postgres, cfssl, logstash, registration, zookeeper]
user: scan:root
image: blackducksoftware/blackduck-scan:2019.10.0
image: blackducksoftware/blackduck-scan:2019.10.1
volumes: [ ]
env_file: [blackduck-config.env ]
healthcheck:
Expand All @@ -80,7 +80,7 @@ services:
jobrunner:
links: [postgres, cfssl, logstash, registration, zookeeper]
user: jobrunner:root
image: blackducksoftware/blackduck-jobrunner:2019.10.0
image: blackducksoftware/blackduck-jobrunner:2019.10.1
volumes: [ ]
env_file: [blackduck-config.env ]
healthcheck:
Expand Down Expand Up @@ -119,7 +119,7 @@ services:
restart: always
mem_limit: 1024m
registration:
image: blackducksoftware/blackduck-registration:2019.10.0
image: blackducksoftware/blackduck-registration:2019.10.1
links: [logstash, cfssl]
volumes: ['config-volume:/opt/blackduck/hub/hub-registration/config']
env_file: [blackduck-config.env]
Expand Down Expand Up @@ -163,7 +163,7 @@ services:
mem_limit: 640M
tmpfs: [/opt/blackduck/hub/webserver/security]
documentation:
image: blackducksoftware/blackduck-documentation:2019.10.0
image: blackducksoftware/blackduck-documentation:2019.10.1
links: [logstash]
env_file: [blackduck-config.env]
user: documentation:root
Expand Down
17 changes: 7 additions & 10 deletions docker-compose/external-postgres-init.pgsql
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ CREATE USER blackduck_reporter;

\c bds_hub
CREATE EXTENSION pgcrypto;
CREATE SCHEMA ${blackduck_mt_schema} AUTHORIZATION blackduck;
GRANT USAGE ON SCHEMA ${blackduck_mt_schema} TO blackduck_user ;
GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA ${blackduck_mt_schema} TO blackduck_user;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA ${blackduck_mt_schema} to blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA ${blackduck_mt_schema} GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON TABLES TO blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA ${blackduck_mt_schema} GRANT ALL PRIVILEGES ON SEQUENCES TO blackduck_user;
GRANT USAGE ON SCHEMA reporting TO blackduck_reporter;
GRANT SELECT ON ALL TABLES IN SCHEMA reporting TO blackduck_reporter;
REVOKE INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA reporting FROM blackduck_reporter;
CREATE SCHEMA st AUTHORIZATION blackduck;
GRANT USAGE ON SCHEMA st TO blackduck_user ;
GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA st TO blackduck_user;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA st to blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA st GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON TABLES TO blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA st GRANT ALL PRIVILEGES ON SEQUENCES TO blackduck_user;
REVOKE ALL ON SCHEMA st FROM blackduck_reporter;

\c bds_hub_report
Expand All @@ -30,7 +27,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON SEQUENCES TO b
GRANT ALL PRIVILEGES ON DATABASE bdio TO blackduck_user;
ALTER DATABASE bdio SET standard_conforming_strings TO ON;

-- Stop here since Amazon RDS does not allow us to run ALTER SYSTEM
-- Stop here since cloud providers do not allow us to run ALTER SYSTEM
\q

ALTER SYSTEM SET autovacuum TO 'on';
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:-2019.10.0}"
readonly HUB_VERSION="${HUB_VERSION:-2019.10.1}"
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=2019.10.0
HUB_VERSION=2019.10.1

# 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:2019.10.0
image: blackducksoftware/blackduck-authentication:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-webapp:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-scan:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-jobrunner:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-registration:2019.10.1
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -178,7 +178,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
documentation:
image: blackducksoftware/blackduck-documentation:2019.10.0
image: blackducksoftware/blackduck-documentation:2019.10.1
env_file: [blackduck-config.env]
user: documentation:root
healthcheck:
Expand Down
2 changes: 2 additions & 0 deletions docker-swarm/docker-compose.readonly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ services:
- /opt/blackduck/hub/tomcat
- /opt/blackduck/hub/hub-webapp/logs
- /opt/blackduck/hub/filebeat
- /tmp
scan:
read_only: true
volumes:
Expand Down Expand Up @@ -62,6 +63,7 @@ services:
- /opt/blackduck/hub/hub-documentation/logs
- /opt/blackduck/hub/filebeat
- /opt/blackduck/hub/tomcat
- /tmp
uploadcache:
read_only: true
volumes:
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:2019.10.0
image: blackducksoftware/blackduck-authentication:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-webapp:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-scan:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-jobrunner:2019.10.1
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:2019.10.0
image: blackducksoftware/blackduck-registration:2019.10.1
volumes:
- config-volume:/opt/blackduck/hub/hub-registration/config
- {type: tmpfs, target: /opt/blackduck/hub/hub-registration/security}
Expand Down Expand Up @@ -196,7 +196,7 @@ services:
limits: {memory: 512M}
reservations: {memory: 512M}
documentation:
image: blackducksoftware/blackduck-documentation:2019.10.0
image: blackducksoftware/blackduck-documentation:2019.10.1
env_file: [blackduck-config.env]
user: documentation:root
healthcheck:
Expand Down
17 changes: 7 additions & 10 deletions docker-swarm/external-postgres-init.pgsql
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ CREATE USER blackduck_reporter;

\c bds_hub
CREATE EXTENSION pgcrypto;
CREATE SCHEMA ${blackduck_mt_schema} AUTHORIZATION blackduck;
GRANT USAGE ON SCHEMA ${blackduck_mt_schema} TO blackduck_user ;
GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA ${blackduck_mt_schema} TO blackduck_user;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA ${blackduck_mt_schema} to blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA ${blackduck_mt_schema} GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON TABLES TO blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA ${blackduck_mt_schema} GRANT ALL PRIVILEGES ON SEQUENCES TO blackduck_user;
GRANT USAGE ON SCHEMA reporting TO blackduck_reporter;
GRANT SELECT ON ALL TABLES IN SCHEMA reporting TO blackduck_reporter;
REVOKE INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA reporting FROM blackduck_reporter;
CREATE SCHEMA st AUTHORIZATION blackduck;
GRANT USAGE ON SCHEMA st TO blackduck_user ;
GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON ALL TABLES IN SCHEMA st TO blackduck_user;
GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA st to blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA st GRANT SELECT, INSERT, UPDATE, TRUNCATE, DELETE, REFERENCES ON TABLES TO blackduck_user;
ALTER DEFAULT PRIVILEGES IN SCHEMA st GRANT ALL PRIVILEGES ON SEQUENCES TO blackduck_user;
REVOKE ALL ON SCHEMA st FROM blackduck_reporter;

\c bds_hub_report
Expand All @@ -30,7 +27,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON SEQUENCES TO b
GRANT ALL PRIVILEGES ON DATABASE bdio TO blackduck_user;
ALTER DATABASE bdio SET standard_conforming_strings TO ON;

-- Stop here since Amazon RDS does not allow us to run ALTER SYSTEM
-- Stop here since cloud providers do not allow us to run ALTER SYSTEM
\q

ALTER SYSTEM SET autovacuum TO 'on';
Expand Down
Binary file modified docs/en_US/getting_started.pdf
Binary file not shown.
Binary file modified docs/en_US/install_compose.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.

0 comments on commit cb5ced8

Please sign in to comment.