Hub release 4.5.1

blackducksoftware · Apr 5, 2018 · 802f9d1 · 802f9d1
1 parent 8315795
commit 802f9d1
Show file tree

Hide file tree

Showing 38 changed files with 130 additions and 142 deletions.
diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 This repository will contain orchestration files and documentation for using the individual Hub Docker containers. 
 
-## Location of hub 4.5.0 archive: 
+## Location of hub 4.5.1 archive: 
 
-https://github.com/blackducksoftware/hub/archive/v4.5.0.tar.gz
+https://github.com/blackducksoftware/hub/archive/v4.5.1.tar.gz
 
 ## Important Upgrade Announcement
 
@@ -33,7 +33,7 @@ https://github.com/blackducksoftware/hub/releases
 
 # Running Hub in Docker
 
-Swarm (mode), Compose, Kubernetes, and OpenShift are supported as of Hub 4.2.0. Instructions for running each can be found in the archive bundle:
+Swarm (mode), Compose, Kubernetes, and OpenShift are supported are supported in Hub 4.2.0. Instructions for running each can be found in the archive bundle:
 
 * docker-swarm - Instructions and files for running Hub with 'docker swarm mode'
 * docker-compose - Instructions and files for running Hub with 'docker-compose'

diff --git a/docker-compose/bin/hub_add_replication_user.sh b/docker-compose/bin/hub_add_replication_user.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-compose/bin/hub_create_data_dump.sh b/docker-compose/bin/hub_create_data_dump.sh
@@ -7,7 +7,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-compose/bin/hub_db_migrate.sh b/docker-compose/bin/hub_db_migrate.sh
@@ -13,7 +13,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-compose/bin/hub_replication_changepassword.sh b/docker-compose/bin/hub_replication_changepassword.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-compose/bin/hub_reportdb_changepassword.sh b/docker-compose/bin/hub_reportdb_changepassword.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {

diff --git a/docker-compose/bin/system_check.sh b/docker-compose/bin/system_check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 TIMESTAMP=`date`
 YEAR=`echo $TIMESTAMP | awk -F' ' '{print $6}'`
 MONTH=`echo $TIMESTAMP | awk -F' ' '{print $2}'`
@@ -25,9 +25,7 @@ RAM_REQUIRED_PHYSICAL_DESCRIPTION="16GB Required"
 RAM_REQUIRED_PHYSICAL_DESCRIPTION_SWARM="20 Required on Swarm Node if all BD Containers are on a single Node including postgres"
 
 DISK_REQUIRED_MB=250000
-MIN_DOCKER_VERSION=17.03
-MIN_DOCKER_MAJOR_VERSION=17
-MIN_DOCKER_MINOR_VERSION=03
+DOCKER_VERSIONS="17.03.x 17.06.x 17.09.x 17.12.x"
 
 printf "Writing System Check Report to: %s\n" "$OUTPUT_FILE"
 
@@ -438,16 +436,9 @@ get_docker_version() {
     echo "Checking Docker Version..."
     docker_version=`docker --version`
 
-    docker_major_version=`docker --version | awk -F' ' '{print $3}' | awk -F'.' '{print $1}'`
-    docker_minor_version=`docker --version | awk -F' ' '{print $3}' | awk -F'.' '{print $1}'`
-
-    if [ "$docker_major_version" -lt "$MIN_DOCKER_MAJOR_VERSION" ] ; then
-      docker_version_check="Docker Version Check - Failed: ($MIN_DOCKER_VERSION required)"
-      return
-    fi
-
-    if [ "$docker_minor_version" -lt "$MIN_DOCKER_MINOR_VERSION" ] ; then
-      docker_version_check="Docker Version Check - Failed: ($MIN_DOCKER_VERSION required)"
+    docker_base_version=`docker version --format "{{.Server.Version}}" | cut -d. -f1-2`
+    if [[ ! "$DOCKER_VERSIONS" =~ $docker_base_version ]] ; then
+      docker_version_check="Docker Version Check - Failed: ($DOCKER_VERSIONS required)"
       return
     fi
 
@@ -1131,12 +1122,13 @@ check_webapp_dns_status() {
 }
 
 copy_to_logstash() {
-  if [[ ${#bd_docker_containers} -gt 360 ]]; then
-    logstash_container=$(docker ps -f name=logstash --format '{{.Names}}')
-    logstash_data_dir=$(docker inspect --format '{{ range .Mounts }}{{ if eq .Name "hub_log-volume" }}{{ .Source }}{{ end }}{{ end }}' ${logstash_container})
-    if [[ -e "$logstash_data_dir" ]]; then
-      cp "$OUTPUT_FILE" "${logstash_data_dir}/latest_system_check.txt"
-    fi
+  logstash_data_dir=$(docker volume ls -f name=_log-volume --format '{{.Mountpoint}}')
+  if [[ -e "$logstash_data_dir" ]]; then
+    first_logstash_dir=$(find "$logstash_data_dir" -name "hub*" | head -n 1)
+    logstash_owner=$(ls -ld "${first_logstash_dir}" | awk '{print $3}')
+    cp "$OUTPUT_FILE" "${logstash_data_dir}/latest_system_check.txt"
+    chown "$logstash_owner":root "${logstash_data_dir}/latest_system_check.txt"
+    chmod 664 "${logstash_data_dir}/latest_system_check.txt"
   fi
 }
 
@@ -1245,7 +1237,7 @@ $SEPARATOR
 Docker Installed: $docker_installed
 Docker Version: $docker_version 
 Docker Version Check: $docker_version_check
-Docker Minimum Version Supported: $MIN_DOCKER_VERSION
+Docker Versions Supported: $DOCKER_VERSIONS
 Docker Compose Installed: $docker_compose_installed
 Docker Compose Version: $docker_compose_version
 Docker Enabled at Startup: $docker_enabled_at_startup

diff --git a/docker-compose/docker-compose.dbmigrate.yml b/docker-compose/docker-compose.dbmigrate.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   cfssl:
-    image: blackducksoftware/hub-cfssl:4.5.0
+    image: blackducksoftware/hub-cfssl:4.5.1
     volumes:
       - cert-volume:/etc/cfssl
     healthcheck:
@@ -12,7 +12,7 @@ services:
     user: 'cfssl:root'
 
   logstash:
-    image: blackducksoftware/hub-logstash:4.5.0
+    image: blackducksoftware/hub-logstash:4.5.1
     volumes:
       - log-volume:/var/lib/logstash/data
     healthcheck:
@@ -23,7 +23,7 @@ services:
     user: 'logstash:root'
 
   postgres:
-    image: blackducksoftware/hub-postgres:4.5.0
+    image: blackducksoftware/hub-postgres:4.5.1
     links:
       - cfssl
       - logstash

diff --git a/docker-compose/docker-compose.externaldb.yml b/docker-compose/docker-compose.externaldb.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   cfssl:
-    image: blackducksoftware/hub-cfssl:4.5.0
+    image: blackducksoftware/hub-cfssl:4.5.1
     volumes: ['cert-volume:/etc/cfssl']
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:8888/api/v1/cfssl/scaninfo']
@@ -12,7 +12,7 @@ services:
     restart: always
     mem_limit: 512M
   logstash:
-    image: blackducksoftware/hub-logstash:4.5.0
+    image: blackducksoftware/hub-logstash:4.5.1
     volumes: ['log-volume:/var/lib/logstash/data']
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:9600/']
@@ -23,7 +23,7 @@ services:
     restart: always
     mem_limit: 640M
   registration:
-    image: blackducksoftware/hub-registration:4.5.0
+    image: blackducksoftware/hub-registration:4.5.1
     links: [logstash]
     volumes: ['config-volume:/opt/blackduck/hub/hub-registration/config']
     env_file: hub-proxy.env
@@ -37,7 +37,7 @@ services:
     restart: always
     mem_limit: 640M
   zookeeper:
-    image: blackducksoftware/hub-zookeeper:4.5.0
+    image: blackducksoftware/hub-zookeeper:4.5.1
     links: [logstash]
     healthcheck:
       test: [CMD, zkServer.sh, status, /opt/blackduck/zookeeper/conf/zoo.cfg]
@@ -48,7 +48,7 @@ services:
     restart: always
     mem_limit: 384M
   solr:
-    image: blackducksoftware/hub-solr:4.5.0
+    image: blackducksoftware/hub-solr:4.5.1
     links: [logstash, zookeeper]
     volumes: ['solr6-volume:/opt/blackduck/hub/solr/cores.data']
     healthcheck:
@@ -60,7 +60,7 @@ services:
     restart: always
     mem_limit: 640M
   authentication:
-    image: blackducksoftware/hub-authentication:4.5.0
+    image: blackducksoftware/hub-authentication:4.5.1
     links: [cfssl, logstash, registration, zookeeper]
     volumes: ['authentication-volume:/opt/blackduck/hub/hub-authentication/security']
     env_file: [hub-proxy.env, hub-postgres.env]
@@ -75,7 +75,7 @@ services:
     restart: always
     mem_limit: 1024M
   webapp:
-    image: blackducksoftware/hub-webapp:4.5.0
+    image: blackducksoftware/hub-webapp:4.5.1
     links: [cfssl, logstash, registration, zookeeper, solr]
     volumes: ['log-volume:/opt/blackduck/hub/logs', 'webapp-volume:/opt/blackduck/hub/hub-webapp/security']
     env_file: [hub-proxy.env, hub-postgres.env]
@@ -90,7 +90,7 @@ services:
     restart: always
     mem_limit: 2560M
   scan:
-    image: blackducksoftware/hub-scan:4.5.0
+    image: blackducksoftware/hub-scan:4.5.1
     links: [cfssl, logstash, registration, zookeeper]
     volumes: ['scan-volume:/opt/blackduck/hub/hub-scan/security']
     env_file: [hub-proxy.env, hub-postgres.env]
@@ -105,7 +105,7 @@ services:
     restart: always
     mem_limit: 2560M
   jobrunner:
-    image: blackducksoftware/hub-jobrunner:4.5.0
+    image: blackducksoftware/hub-jobrunner:4.5.1
     links: [cfssl, logstash, registration, zookeeper, solr]
     env_file: [hub-proxy.env, hub-postgres.env]
     healthcheck:
@@ -118,7 +118,7 @@ services:
     restart: always
     mem_limit: 4608M
   webserver:
-    image: blackducksoftware/hub-nginx:4.5.0
+    image: blackducksoftware/hub-nginx:4.5.1
     ports: ['443:8443']
     env_file: hub-webserver.env
     links: [webapp, cfssl, documentation]
@@ -133,7 +133,7 @@ services:
     restart: always
     mem_limit: 640M
   documentation:
-    image: blackducksoftware/hub-documentation:4.5.0
+    image: blackducksoftware/hub-documentation:4.5.1
     links: [logstash]
     user: tomcat:root
     healthcheck:

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   postgres:
-    image: blackducksoftware/hub-postgres:4.5.0
+    image: blackducksoftware/hub-postgres:4.5.1
     ports: ['55436:5432']
     links: [cfssl, logstash]
     volumes: ['postgres96-data-volume:/var/lib/postgresql/data']
@@ -16,7 +16,7 @@ services:
   authentication:
     links: [postgres, cfssl, logstash, registration, zookeeper]
     user: authentication:root
-    image: blackducksoftware/hub-authentication:4.5.0
+    image: blackducksoftware/hub-authentication:4.5.1
     volumes: ['authentication-volume:/opt/blackduck/hub/hub-authentication/security']
     env_file: [hub-proxy.env]
     healthcheck:
@@ -31,7 +31,7 @@ services:
   webapp:
     links: [postgres, cfssl, logstash, registration, zookeeper, solr]
     user: tomcat:root
-    image: blackducksoftware/hub-webapp:4.5.0
+    image: blackducksoftware/hub-webapp:4.5.1
     volumes: ['log-volume:/opt/blackduck/hub/logs', 'webapp-volume:/opt/blackduck/hub/hub-webapp/security']
     env_file: [hub-proxy.env]
     healthcheck:
@@ -46,7 +46,7 @@ services:
   scan:
     links: [postgres, cfssl, logstash, registration, zookeeper]
     user: tomcat:root
-    image: blackducksoftware/hub-scan:4.5.0
+    image: blackducksoftware/hub-scan:4.5.1
     volumes: ['scan-volume:/opt/blackduck/hub/hub-scan/security']
     env_file: [hub-proxy.env]
     healthcheck:
@@ -61,7 +61,7 @@ services:
   jobrunner:
     links: [postgres, cfssl, logstash, registration, zookeeper, solr]
     user: jobrunner:root
-    image: blackducksoftware/hub-jobrunner:4.5.0
+    image: blackducksoftware/hub-jobrunner:4.5.1
     env_file: [hub-proxy.env]
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh]
@@ -72,7 +72,7 @@ services:
     restart: always
     mem_limit: 4608M
   cfssl:
-    image: blackducksoftware/hub-cfssl:4.5.0
+    image: blackducksoftware/hub-cfssl:4.5.1
     volumes: ['cert-volume:/etc/cfssl']
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:8888/api/v1/cfssl/scaninfo']
@@ -83,7 +83,7 @@ services:
     restart: always
     mem_limit: 512M
   logstash:
-    image: blackducksoftware/hub-logstash:4.5.0
+    image: blackducksoftware/hub-logstash:4.5.1
     volumes: ['log-volume:/var/lib/logstash/data']
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:9600/']
@@ -94,7 +94,7 @@ services:
     restart: always
     mem_limit: 640M
   registration:
-    image: blackducksoftware/hub-registration:4.5.0
+    image: blackducksoftware/hub-registration:4.5.1
     links: [logstash]
     volumes: ['config-volume:/opt/blackduck/hub/hub-registration/config']
     env_file: hub-proxy.env
@@ -108,7 +108,7 @@ services:
     restart: always
     mem_limit: 640M
   zookeeper:
-    image: blackducksoftware/hub-zookeeper:4.5.0
+    image: blackducksoftware/hub-zookeeper:4.5.1
     links: [logstash]
     healthcheck:
       test: [CMD, zkServer.sh, status, /opt/blackduck/zookeeper/conf/zoo.cfg]
@@ -119,7 +119,7 @@ services:
     restart: always
     mem_limit: 384M
   solr:
-    image: blackducksoftware/hub-solr:4.5.0
+    image: blackducksoftware/hub-solr:4.5.1
     links: [logstash, zookeeper]
     volumes: ['solr6-volume:/opt/blackduck/hub/solr/cores.data']
     healthcheck:
@@ -131,7 +131,7 @@ services:
     restart: always
     mem_limit: 640M
   webserver:
-    image: blackducksoftware/hub-nginx:4.5.0
+    image: blackducksoftware/hub-nginx:4.5.1
     ports: ['443:8443']
     env_file: hub-webserver.env
     links: [webapp, cfssl, documentation]
@@ -146,7 +146,7 @@ services:
     restart: always
     mem_limit: 640M
   documentation:
-    image: blackducksoftware/hub-documentation:4.5.0
+    image: blackducksoftware/hub-documentation:4.5.1
     links: [logstash]
     user: tomcat:root
     healthcheck:

diff --git a/docker-compose/hub-proxy.env b/docker-compose/hub-proxy.env
@@ -27,5 +27,7 @@ BLACKDUCK_SWAGGER_PROXY_PREFIX=
 BLACKDUCK_SWAGGER_DISPLAYALL=
 
 # Do not change
-HUB_VERSION=4.5.0
+HUB_VERSION=4.5.1
 
+# TO disable hub dashboard
+DISABLE_HUB_DASHBOARD=
diff --git 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_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 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
@@ -7,7 +7,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-4.5.0}
+HUB_VERSION=${HUB_VERSION:-4.5.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {