Skip to content

Commit

Permalink
Automatic: Updates from the build for release 4.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
DanaMaxfield committed Feb 28, 2018
1 parent 27f2726 commit 3df02df
Show file tree
Hide file tree
Showing 47 changed files with 140 additions and 141 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

This repository will contain orchestration files and documentation for using the individual Hub Docker containers.

## Location of hub 4.4.1 archive:
## Location of hub 4.2.0 archive:

https://github.com/blackducksoftware/hub/archive/v4.4.1.tar.gz
https://github.com/blackducksoftware/hub/archive/v4.2.0.tar.gz

## Important Upgrade Announcement

Expand Down Expand Up @@ -32,7 +32,7 @@ https://github.com/blackducksoftware/hub/releases

# Running Hub in Docker

Swarm (mode), Compose, 'docker run', Kubernetes, and OpenShift are supported are supported in Hub 4.4.1. Instructions for running each can be found in the archive bundle:
Swarm (mode), Compose, 'docker run', Kubernetes, and OpenShift are supported are supported in Hub 4.2.0. Instructions for running each can be found in the archive bundle:

* docker-run - Instructions and files for running Hub with 'docker run'
* docker-swarm - Instructions and files for running Hub with 'docker swarm mode'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/bin/hub_add_replication_user.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/bin/hub_create_data_dump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/bin/hub_db_migrate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/bin/hub_replication_changepassword.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/bin/hub_reportdb_changepassword.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/bin/system_check.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
TIMESTAMP=`date`
YEAR=`echo $TIMESTAMP | awk -F' ' '{print $6}'`
MONTH=`echo $TIMESTAMP | awk -F' ' '{print $2}'`
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/docker-compose.dbmigrate.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.1'
services:
cfssl:
image: blackducksoftware/hub-cfssl:4.4.1
image: blackducksoftware/hub-cfssl:4.4.2
volumes:
- cert-volume:/etc/cfssl
healthcheck:
Expand All @@ -12,7 +12,7 @@ services:
user: 'cfssl:root'

logstash:
image: blackducksoftware/hub-logstash:4.4.1
image: blackducksoftware/hub-logstash:4.4.2
volumes:
- log-volume:/var/lib/logstash/data
healthcheck:
Expand All @@ -23,7 +23,7 @@ services:
user: 'logstash:root'

postgres:
image: blackducksoftware/hub-postgres:4.4.1
image: blackducksoftware/hub-postgres:4.4.2
links:
- cfssl
- logstash
Expand Down
20 changes: 10 additions & 10 deletions docker-compose/docker-compose.externaldb.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.1'
services:
cfssl:
image: blackducksoftware/hub-cfssl:4.4.1
image: blackducksoftware/hub-cfssl:4.4.2
volumes: ['cert-volume:/etc/cfssl']
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:8888/api/v1/cfssl/scaninfo']
Expand All @@ -12,7 +12,7 @@ services:
restart: always
mem_limit: 512M
logstash:
image: blackducksoftware/hub-logstash:4.4.1
image: blackducksoftware/hub-logstash:4.4.2
volumes: ['log-volume:/var/lib/logstash/data']
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:9600/']
Expand All @@ -23,7 +23,7 @@ services:
restart: always
mem_limit: 640M
registration:
image: blackducksoftware/hub-registration:4.4.1
image: blackducksoftware/hub-registration:4.4.2
links: [logstash]
volumes: ['config-volume:/opt/blackduck/hub/registration/config']
env_file: hub-proxy.env
Expand All @@ -36,7 +36,7 @@ services:
restart: always
mem_limit: 640M
zookeeper:
image: blackducksoftware/hub-zookeeper:4.4.1
image: blackducksoftware/hub-zookeeper:4.4.2
links: [logstash]
healthcheck:
test: [CMD, zkServer.sh, status, /opt/blackduck/zookeeper/conf/zoo.cfg]
Expand All @@ -47,7 +47,7 @@ services:
restart: always
mem_limit: 384M
solr:
image: blackducksoftware/hub-solr:4.4.1
image: blackducksoftware/hub-solr:4.4.2
links: [logstash, zookeeper]
volumes: ['solr6-volume:/opt/blackduck/hub/solr/cores.data']
healthcheck:
Expand All @@ -59,7 +59,7 @@ services:
restart: always
mem_limit: 640M
webapp:
image: blackducksoftware/hub-webapp:4.4.1
image: blackducksoftware/hub-webapp:4.4.2
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]
Expand All @@ -73,7 +73,7 @@ services:
restart: always
mem_limit: 2560M
scan:
image: blackducksoftware/hub-scan:4.4.1
image: blackducksoftware/hub-scan:4.4.2
links: [cfssl, logstash, registration, zookeeper]
volumes: ['log-volume:/opt/blackduck/hub/logs', 'scan-volume:/opt/blackduck/hub/hub-scan/security']
env_file: [hub-proxy.env, hub-postgres.env]
Expand All @@ -87,7 +87,7 @@ services:
restart: always
mem_limit: 2560M
jobrunner:
image: blackducksoftware/hub-jobrunner:4.4.1
image: blackducksoftware/hub-jobrunner:4.4.2
links: [cfssl, logstash, registration, zookeeper, solr]
env_file: [hub-proxy.env, hub-postgres.env]
healthcheck:
Expand All @@ -100,7 +100,7 @@ services:
restart: always
mem_limit: 4608M
webserver:
image: blackducksoftware/hub-nginx:4.4.1
image: blackducksoftware/hub-nginx:4.4.2
ports: ['443:8443']
env_file: hub-webserver.env
links: [webapp, cfssl, documentation]
Expand All @@ -115,7 +115,7 @@ services:
restart: always
mem_limit: 640M
documentation:
image: blackducksoftware/hub-documentation:4.4.1
image: blackducksoftware/hub-documentation:4.4.2
links: [logstash]
user: tomcat:root
healthcheck:
Expand Down
22 changes: 11 additions & 11 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2.1'
services:
postgres:
image: blackducksoftware/hub-postgres:4.4.1
image: blackducksoftware/hub-postgres:4.4.2
ports: ['55436:5432']
links: [cfssl, logstash]
volumes: ['postgres96-data-volume:/var/lib/postgresql/data']
Expand All @@ -16,7 +16,7 @@ services:
webapp:
links: [postgres, cfssl, logstash, registration, zookeeper, solr]
user: tomcat:root
image: blackducksoftware/hub-webapp:4.4.1
image: blackducksoftware/hub-webapp:4.4.2
volumes: ['log-volume:/opt/blackduck/hub/logs', 'webapp-volume:/opt/blackduck/hub/hub-webapp/security']
env_file: [hub-proxy.env]
healthcheck:
Expand All @@ -30,7 +30,7 @@ services:
scan:
links: [postgres, cfssl, logstash, registration, zookeeper]
user: tomcat:root
image: blackducksoftware/hub-scan:4.4.1
image: blackducksoftware/hub-scan:4.4.2
volumes: ['log-volume:/opt/blackduck/hub/logs', 'scan-volume:/opt/blackduck/hub/hub-scan/security']
env_file: [hub-proxy.env]
healthcheck:
Expand All @@ -44,7 +44,7 @@ services:
jobrunner:
links: [postgres, cfssl, logstash, registration, zookeeper, solr]
user: jobrunner:root
image: blackducksoftware/hub-jobrunner:4.4.1
image: blackducksoftware/hub-jobrunner:4.4.2
env_file: [hub-proxy.env]
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh]
Expand All @@ -55,7 +55,7 @@ services:
restart: always
mem_limit: 4608M
cfssl:
image: blackducksoftware/hub-cfssl:4.4.1
image: blackducksoftware/hub-cfssl:4.4.2
volumes: ['cert-volume:/etc/cfssl']
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:8888/api/v1/cfssl/scaninfo']
Expand All @@ -66,7 +66,7 @@ services:
restart: always
mem_limit: 512M
logstash:
image: blackducksoftware/hub-logstash:4.4.1
image: blackducksoftware/hub-logstash:4.4.2
volumes: ['log-volume:/var/lib/logstash/data']
healthcheck:
test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://localhost:9600/']
Expand All @@ -77,7 +77,7 @@ services:
restart: always
mem_limit: 640M
registration:
image: blackducksoftware/hub-registration:4.4.1
image: blackducksoftware/hub-registration:4.4.2
links: [logstash]
volumes: ['config-volume:/opt/blackduck/hub/registration/config']
env_file: hub-proxy.env
Expand All @@ -90,7 +90,7 @@ services:
restart: always
mem_limit: 640M
zookeeper:
image: blackducksoftware/hub-zookeeper:4.4.1
image: blackducksoftware/hub-zookeeper:4.4.2
links: [logstash]
healthcheck:
test: [CMD, zkServer.sh, status, /opt/blackduck/zookeeper/conf/zoo.cfg]
Expand All @@ -101,7 +101,7 @@ services:
restart: always
mem_limit: 384M
solr:
image: blackducksoftware/hub-solr:4.4.1
image: blackducksoftware/hub-solr:4.4.2
links: [logstash, zookeeper]
volumes: ['solr6-volume:/opt/blackduck/hub/solr/cores.data']
healthcheck:
Expand All @@ -113,7 +113,7 @@ services:
restart: always
mem_limit: 640M
webserver:
image: blackducksoftware/hub-nginx:4.4.1
image: blackducksoftware/hub-nginx:4.4.2
ports: ['443:8443']
env_file: hub-webserver.env
links: [webapp, cfssl, documentation]
Expand All @@ -128,7 +128,7 @@ services:
restart: always
mem_limit: 640M
documentation:
image: blackducksoftware/hub-documentation:4.4.1
image: blackducksoftware/hub-documentation:4.4.2
links: [logstash]
user: tomcat:root
healthcheck:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/hub-proxy.env
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ BLACKDUCK_SWAGGER_PROXY_PREFIX=
BLACKDUCK_SWAGGER_DISPLAYALL=

# Do not change
HUB_VERSION=4.4.1
HUB_VERSION=4.4.2

2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_add_replication_user.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
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 @@ -7,7 +7,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_db_migrate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_replication_changepassword.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/hub_reportdb_changepassword.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e

TIMEOUT=${TIMEOUT:-10}
HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}

function fail() {
Expand Down
2 changes: 1 addition & 1 deletion docker-swarm/bin/system_check.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

HUB_VERSION=${HUB_VERSION:-4.4.1}
HUB_VERSION=${HUB_VERSION:-4.4.2}
TIMESTAMP=`date`
YEAR=`echo $TIMESTAMP | awk -F' ' '{print $6}'`
MONTH=`echo $TIMESTAMP | awk -F' ' '{print $2}'`
Expand Down
6 changes: 3 additions & 3 deletions docker-swarm/docker-compose.dbmigrate.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.1'
services:
cfssl:
image: blackducksoftware/hub-cfssl:4.4.1
image: blackducksoftware/hub-cfssl:4.4.2
volumes:
- cert-volume:/etc/cfssl
healthcheck:
Expand All @@ -12,7 +12,7 @@ services:
user: 'cfssl:root'

logstash:
image: blackducksoftware/hub-logstash:4.4.1
image: blackducksoftware/hub-logstash:4.4.2
volumes:
- log-volume:/var/lib/logstash/data
healthcheck:
Expand All @@ -23,7 +23,7 @@ services:
user: 'logstash:root'

postgres:
image: blackducksoftware/hub-postgres:4.4.1
image: blackducksoftware/hub-postgres:4.4.2
links:
- cfssl
- logstash
Expand Down
Loading

0 comments on commit 3df02df

Please sign in to comment.