If Postgres jdbc points outside of the container

mauro-api/docker/all/micronaut/micronaut-config.sh

@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+set -e
+
+if [ -e /opt/init/micronaut ];
+then
+  mkdir -p /home/app/plugins
+  pushd /opt/init/micronaut
+
+        shopt -s nullglob
+        for f in *
+        do
+          case "${f}" in
+            *.sh)
+                echo "Running ${f}"
+                if [ -x "${f}" ];
+                then
+                    /bin/bash "${f}"
+                else
+                    . "${f}"
+                fi
+              ;;
+            *.jar)
+              echo "Adding ${f} as plugin"
+              cp -pf ${f} /home/app/plugins/.
+              ;;
+            *)
+                  echo "Copying ${f} to micronaut resources"
+                  cp "${f}" /home/app/resources/.
+              ;;
+          esac
+        done
+        shopt -u nullglob
+  popd
+else
+      echo "No /opt/init/micronaut for *.sh *.yml *.xml *.properties etc - skipping"
+fi

mauro-api/docker/all/micronaut/micronaut-startup.sh

@@ -1,42 +1,10 @@
 #!/usr/bin/env bash
 set -e
 
-if [ -e /opt/init/micronaut ];
-then
-  mkdir -p /home/app/plugins
-  pushd /opt/init/micronaut
-
-        shopt -s nullglob
-        for f in *
-        do
-          case "${f}" in
-            *.sh)
-                echo "Running ${f}"
-                if [ -x "${f}" ];
-                then
-                    /bin/bash "${f}"
-                else
-                    . "${f}"
-                fi
-              ;;
-            *.jar)
-              echo "Adding ${f} as plugin"
-              cp -pf ${f} /home/app/plugins/.
-              ;;
-            *)
-                  echo "Copying ${f} to micronaut resources"
-                  cp "${f}" /home/app/resources/.
-              ;;
-          esac
-        done
-        shopt -u nullglob
-  popd
-else
-      echo "No /opt/init/micronaut for *.sh *.yml *.xml *.properties etc - skipping"
-fi
-
 # Figure out the java options
 
+if [ "${PG_SHARING_HOST}" == "true" ];
+then
 declare -A java_opts=(
   [4]="-server -Xms614M -Xmx2457M -XX:MaxNewSize=1126M -XX:NewSize=204M -XX:MetaspaceSize=256M -XX:MaxMetaspaceSize=784M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=240M"
   [8]="-server -Xms1843M -Xmx7372M -XX:MaxNewSize=3379M -XX:NewSize=614M -XX:MetaspaceSize=768M -XX:MaxMetaspaceSize=2764M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=307M"
@@ -49,6 +17,20 @@ declare -A java_opts=(
   [96]="-server -Xms28876M -Xmx115507M -XX:MaxNewSize=52940M -XX:NewSize=9625M -XX:MetaspaceSize=12032M -XX:MaxMetaspaceSize=43315M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=4812M"
   [128]="server -Xms38707M -Xmx154828M -XX:MaxNewSize=70963M -XX:NewSize=12902M -XX:MetaspaceSize=16128M -XX:MaxMetaspaceSize=58060M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=6451M"
 )
+else
+  declare -A java_opts=(
+    [2]="-server -Xms614M -Xmx2457M -XX:MaxNewSize=1126M -XX:NewSize=204M -XX:MetaspaceSize=256M -XX:MaxMetaspaceSize=784M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=240M"
+    [4]="-server -Xms1843M -Xmx7372M -XX:MaxNewSize=3379M -XX:NewSize=614M -XX:MetaspaceSize=768M -XX:MaxMetaspaceSize=2764M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=307M"
+    [6]="-server -Xms3G -Xmx12G -XX:MaxNewSize=5632M -XX:NewSize=1G -XX:MetaspaceSize=1280M -XX:MaxMetaspaceSize=4608M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=512M"
+    [8]="-server -Xms4300M -Xmx17203M -XX:MaxNewSize=7884M -XX:NewSize=1433M -XX:MetaspaceSize=1792M -XX:MaxMetaspaceSize=6451M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=716M"
+    [12]="-server -Xms6758M -Xmx27033M -XX:MaxNewSize=12390M -XX:NewSize=2252M -XX:MetaspaceSize=2816M -XX:MaxMetaspaceSize=10137M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=1126M"
+    [16]="-server -Xms9G -Xmx36G -XX:MaxNewSize=16896M -XX:NewSize=3G -XX:MetaspaceSize=3840M -XX:MaxMetaspaceSize=13824M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=1536M"
+    [24]="-server -Xms14131M -Xmx56524M -XX:MaxNewSize=25907M -XX:NewSize=4710M -XX:MetaspaceSize=5888M -XX:MaxMetaspaceSize=21196M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=2355M"
+    [32]="-server -Xms19046M -Xmx76185M -XX:MaxNewSize=34918M -XX:NewSize=6348M -XX:MetaspaceSize=7936M -XX:MaxMetaspaceSize=28569M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=3174M"
+    [48]="-server -Xms28876M -Xmx115507M -XX:MaxNewSize=52940M -XX:NewSize=9625M -XX:MetaspaceSize=12032M -XX:MaxMetaspaceSize=43315M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=4812M"
+    [64]="server -Xms38707M -Xmx154828M -XX:MaxNewSize=70963M -XX:NewSize=12902M -XX:MetaspaceSize=16128M -XX:MaxMetaspaceSize=58060M -XX:NewRatio=2 -XX:SurvivorRatio=2 -XX:TargetSurvivorRatio=80 -XX:+UseParallelGC -XX:+AggressiveHeap -XX:GCTimeRatio=19 -XX:MaxGCPauseMillis=3500 -XX:InitialCodeCacheSize=48M -XX:ReservedCodeCacheSize=6451M"
+  )
+fi
 
 chosen_opts=""
 best_key=0

mauro-api/docker/all/postgres/micronaut-config-for-postgres.sh

@@ -45,7 +45,8 @@ function yaml_val {
     }
    }'
 }
-
+export PG_RUNNING_INTERNALLY="true"
+export PG_SHARING_HOST="true"
 if [ -e /home/app/resources ];
   then
       if [[ -v DATABASE_NAME ]];
@@ -59,6 +60,7 @@ if [ -e /home/app/resources ];
 
         if [ -e "/home/app/resources/application-datasources.yml" ];
         then
+          echo "Reading application-datasources.yml"
           datasources_default_url=$(yaml_val "/home/app/resources/application-datasources.yml" 'datasources_default_url')
           datasources_default_username=$(yaml_val "/home/app/resources/application-datasources.yml" 'datasources_default_username')
           datasources_default_password=$(yaml_val "/home/app/resources/application-datasources.yml" 'datasources_default_password')
@@ -74,6 +76,7 @@ if [ -e /home/app/resources ];
         if [ "${datasources_default_url}" == "" ];
         then
           datasources_default_url="jdbc:postgresql://localhost:5432/sandbox"
+          echo "Setting default jdbc url: ${datasources_default_url}"
         fi
 
         if [ "${datasources_default_username}" == "" ];
@@ -93,6 +96,42 @@ if [ -e /home/app/resources ];
         db="${db%%\?*}"
 
         export DATABASE_NAME="${db}"
+
+        URL_NO_PREFIX="${datasources_default_url#jdbc:postgresql://}"
+        HOSTPORT="${URL_NO_PREFIX%%/*}"
+        export POSTGRES_HOST="${HOSTPORT%%:*}"
+
+        export POSTGRES_PORT="${HOSTPORT##*:}"
+
+        if [ "$POSTGRES_PORT" = "$HOSTPORT" ]; then
+          export POSTGRES_PORT=5432
+        fi
+
+        export PG_RUNNING_INTERNALLY="false"
+
+        for addr in ${DOCKER_LOCAL_ADDRESSES}
+        do
+          case "$POSTGRES_HOST" in
+            $addr)
+              export PG_RUNNING_INTERNALLY="true"
+              break
+              ;;
+          esac
+        done
+
+        export PG_SHARING_HOST="false"
+        for addr in ${DOCKER_BRIDGE_ADDRESSES}
+        do
+          case "$POSTGRES_HOST" in
+            $addr)
+              export PG_SHARING_HOST="true"
+              break
+              ;;
+          esac
+        done
+
+        echo "PG_SHARING_HOST: ${PG_SHARING_HOST}"
+
       fi
 else
   echo "Missing resource files"

mauro-api/docker/all/postgres/postgres-shutdown.sh

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-if [ -s "${DATABASE_DIRECTORY}/PG_VERSION" ];
-then
-  PG_BIN="$(find /usr/lib/postgresql -name 'bin')"
-  export PATH="${PG_BIN}:${PATH}"
-  echo "Shutting down Postgres..."
-  pg_ctl -D "${DATABASE_DIRECTORY}" stop -m fast -w
+if [ "${PG_RUNNING_INTERNALLY}" != "false" ];
+  then
+  if [ -s "${DATABASE_DIRECTORY}/PG_VERSION" ];
+  then
+    PG_BIN="$(find /usr/lib/postgresql -name 'bin')"
+    export PATH="${PG_BIN}:${PATH}"
+    echo "Shutting down internal Postgres..."
+    pg_ctl -D "${DATABASE_DIRECTORY}" stop -m fast -w
+  fi
 fi