fix java_heap_size script

 Changes to be committed:
	modified:   docker-compose.yml
	modified:   image-files/scripts/common.sh
	modified:   latest/Dockerfile.tws
	modified:   latest/scripts/common.sh
	modified:   latest/scripts/run.sh
	modified:   latest/tws-scripts/run_tws.sh

docker-compose.yml

@@ -26,6 +26,7 @@ services:
       TIME_ZONE: ${TIME_ZONE:-Etc/UTC}
       TZ: ${TIME_ZONE:-Etc/UTC}
       CUSTOM_CONFIG: ${CUSTOM_CONFIG:-NO}
+      JAVA_HEAP_SIZE: ${JAVA_HEAP_SIZE:-}
       SSH_TUNNEL: ${SSH_TUNNEL:-}
       SSH_OPTIONS: ${SSH_OPTIONS:-}
       SSH_ALIVE_INTERVAL: ${SSH_ALIVE_INTERVAL:-}

image-files/scripts/common.sh

@@ -120,7 +120,7 @@ set_ports() {
 set_java_heap() {
 	if [ -n "${JAVA_HEAP_SIZE}" ]; then
 		_vmpath="${TWS_PATH}/ibgateway/${IB_GATEWAY_VERSION}"
-		_string="s/-Xmx768m/-Xmx${TWS_HEAP_SIZE}m/g"
+		_string="s/-Xmx768m/-Xmx${JAVA_HEAP_SIZE}m/g"
 		sed -i "${_string}" "${_vmpath}/ibgateway.vmoptions"
 		echo ".> Java heap size set to ${JAVA_HEAP_SIZE}m"
 	else

latest/Dockerfile.tws

@@ -34,12 +34,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN \
   apt-get update -y && \
   apt-get install --no-install-recommends --yes socat sshpass gettext-base \
-    libnspr4 libnss3 libasound2 libatk-bridge2.0-0 libatk1.0-0 libatspi2.0-0 \
-    libc6 libcairo2 libcrypto++8 libcups2 libdbus-1-3 libdrm2 libexpat1 \
-    libfontconfig1 libgbm1 libgcc-s1 libglib2.0-0 libgtk-3-0 libnspr4 libnss3 \
-    libpango-1.0-0 libpulse0 libx11-6 libxcb1 libxcomposite1 libxdamage1 \
-    libxext6 libxfixes3 libxkbcommon0 libxrandr2 libxshmfence1 libxtst6 \
-    xdg-utils && \
+    libnspr4 libnss3 libcrypto++8 xdg-utils xfce4-cpugraph-plugin \
+    xfce4-netload-plugin xfce4-taskmanager xfce4-xkb-plugin xfce4-notes \
+    gvfs gvfs-backends gvfs-fuse && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* # end
 

latest/scripts/common.sh

@@ -116,3 +116,14 @@ set_ports() {
 	echo ".> SOCAT_PORT set to: ${SOCAT_PORT}"
 
 }
+
+set_java_heap() {
+	if [ -n "${JAVA_HEAP_SIZE}" ]; then
+		_vmpath="${TWS_PATH}/ibgateway/${IB_GATEWAY_VERSION}"
+		_string="s/-Xmx768m/-Xmx${JAVA_HEAP_SIZE}m/g"
+		sed -i "${_string}" "${_vmpath}/ibgateway.vmoptions"
+		echo ".> Java heap size set to ${JAVA_HEAP_SIZE}m"
+	else
+		echo ".> Usign default Java heap size 768m."
+	fi
+}

latest/scripts/run.sh

@@ -74,6 +74,9 @@ apply_settings
 # set API and socat ports
 set_ports
 
+# Java heap size
+set_java_heap
+
 # forward ports, socat or ssh
 "${SCRIPT_PATH}/port_forwarding.sh" &
 

latest/tws-scripts/run_tws.sh

@@ -41,6 +41,9 @@ set_ports
 # apply settings
 apply_settings
 
+# Java heap size
+set_java_heap
+
 # forward ports, socat or ssh
 "${SCRIPT_PATH}/port_forwarding.sh" &