Merge pull request oracle#951 from ericsmalling/fixformac

MacOS fix for md5sum, and matched password to README.md
NafisRubio · Sep 14, 2018 · 8dcdc49 · 8dcdc49
2 parents 167394a + 8f1900b
commit 8dcdc49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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=MyWLSAdminPassword123
 DB_SCHEMA_PASSWORD=MyDBPasswd

diff --git 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"