academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into capifix

Browse Source
This commit is contained in:
Arthur Barr
2019-06-10 10:30:50 +01:00
committed by GitHub
parent 7ab30723cd 83fe77b222
commit 95ba16cdb2
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -18,6 +18,8 @@
############################################################################### ###############################################################################
# MQ_VERSION is the fully qualified MQ version number to build # MQ_VERSION is the fully qualified MQ version number to build
MQ_VERSION ?= 9.1.2.0 MQ_VERSION ?= 9.1.2.0
# RELEASE shows what release of the container code has been built
RELEASE ?= 3
# MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can # MQ_ARCHIVE is the name of the file, under the downloads directory, from which MQ Advanced can
# be installed. The default value is derived from MQ_VERSION, BASE_IMAGE and architecture # be installed. The default value is derived from MQ_VERSION, BASE_IMAGE and architecture
# Does not apply to MQ Advanced for Developers. # Does not apply to MQ Advanced for Developers.
@@ -217,7 +219,9 @@ define build-mq
--label version=$(MQ_VERSION) \ --label version=$(MQ_VERSION) \
--label name=$1 \ --label name=$1 \
--label build-date=$(shell date +%Y-%m-%dT%H:%M:%S%z) \ --label build-date=$(shell date +%Y-%m-%dT%H:%M:%S%z) \
--label release="" \ --label release="$(RELEASE)" \
--label architecture="$(ARCH)" \
--label run="docker run -d -e LICENSE=accept $1:$2" \
--label vcs-ref=$(IMAGE_REVISION) \ --label vcs-ref=$(IMAGE_REVISION) \
--label vcs-type=git \ --label vcs-type=git \
--label vcs-url=$(IMAGE_SOURCE) \ --label vcs-url=$(IMAGE_SOURCE) \
@@ -237,7 +241,9 @@ define build-mq-ctr
--label version=$(MQ_VERSION) \ --label version=$(MQ_VERSION) \
--label name=$1 \ --label name=$1 \
--label build-date=$(shell date +%Y-%m-%dT%H:%M:%S%z) \ --label build-date=$(shell date +%Y-%m-%dT%H:%M:%S%z) \
--label release="" \ --label release="$(RELEASE)" \
--label architecture="$(ARCH)" \
--label run="docker run -d -e LICENSE=accept $1:$2" \
--label vcs-ref=$(IMAGE_REVISION) \ --label vcs-ref=$(IMAGE_REVISION) \
--label vcs-type=git \ --label vcs-type=git \
--label vcs-url=$(IMAGE_SOURCE) \ --label vcs-url=$(IMAGE_SOURCE) \

2
cmd/runmqserver/tls.go
View File

@@ -120,7 +120,7 @@ func configureTLS(certLabel string, cmsKeystore tls.KeyStoreData, devmode bool)
return nil return nil
} }
// configureSSOTLS configures TLS for the Cloud Integration Platform Single Sign-On // configureSSOTLS configures MQ Console TLS for Single Sign-On
func configureSSOTLS(p12TrustStore tls.KeyStoreData) (string, error) { func configureSSOTLS(p12TrustStore tls.KeyStoreData) (string, error) {
// TODO find way to supply this // TODO find way to supply this
// Override the webstore variables to hard coded defaults // Override the webstore variables to hard coded defaults

4
install-mq.sh
View File

@@ -100,3 +100,7 @@ sed -i 's/password\t\[success=1 default=ignore\]\tpam_unix\.so obscure sha512/pa
# List all the installed packages, for the build log # List all the installed packages, for the build log
$RPM && rpm -q --all || true $RPM && rpm -q --all || true
$UBUNTU && dpkg --list || true $UBUNTU && dpkg --list || true
# Copy MQ Licenses into the correct location
mkdir -p /licenses
cp /opt/mqm/licenses/*.txt /licenses/