From 8f1900b9ba0119b8562480be0bf4330da20c66ca Mon Sep 17 00:00:00 2001 From: Eric Smalling Date: Fri, 6 Jul 2018 11:43:11 -0500 Subject: [PATCH] MacOS fix for md5sum, corrected base image and matched password to README.md --- .../dockerfiles/12.2.1.3/infraDomain.env.list | 2 +- OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/infraDomain.env.list b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/infraDomain.env.list index fa9c22ef95..0493b182c3 100644 --- a/OracleFMWInfrastructure/dockerfiles/12.2.1.3/infraDomain.env.list +++ b/OracleFMWInfrastructure/dockerfiles/12.2.1.3/infraDomain.env.list @@ -1,6 +1,6 @@ CONNECTION_STRING=InfraDB:1521/InfraPDB1.us.oracle.com RCUPREFIX=INFRA6 -DB_PASSWORD=MyDBPassword +DB_PASSWORD=MYDBPasswd DB_USERNAME=sys ADMIN_PASSWORD=MyWLSAdminPassword DB_SCHEMA_PASSWORD=MyDBPassword diff --git a/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh b/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh index 82506859aa..1a2819c536 100755 --- a/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh +++ b/OracleFMWInfrastructure/dockerfiles/buildDockerImage.sh @@ -70,7 +70,11 @@ echo "Image name: " $IMAGE_NAME # Validate packages checksumPackages() { echo "Checking if required packages are present and valid..." - md5sum -c Checksum + MD5CMD="md5sum -c Checksum" + if ! [ -x "$(command -v md5sum)" ]; then + MD5CMD="docker run -it --rm -v$(pwd):/md5dir oracle/serverjre:8 sh -c cd /md5dir; ${MD5CMD}" + fi + $MD5CMD if [ "$?" -ne 0 ]; then echo "MD5 for required packages to build this image did not match!" echo "Make sure to download missing files in folder $VERSION. See *.download files for more information"