Update stable to 10.37.1m (#332)

Co-authored-by: github-actions <[email protected]>

Author: github-actions[bot]

README.md

@@ -38,9 +38,9 @@ Images are provided for [IB gateway][1] and [TWS][2]. With the following tags:
 | Image| Channel  | IB Gateway Version  | IBC Version      | Docker Tags                                    |
 | --- | -------- | ------------------- | ---------------- | ---------------------------------------------- |
 | [ib-gateway][1] | `latest` | `10.41.1d` | `3.23.0` | `latest` `10.41` `10.41.1d` |
-| [ib-gateway][1] |`stable` | `10.37.1l` | `3.23.0` | `stable` `10.37` `10.37.1l` |
+| [ib-gateway][1] |`stable` | `10.37.1m` | `3.23.0` | `stable` `10.37` `10.37.1m` |
 | [tws-rdesktop][2] | `latest` | `10.41.1d` | `3.23.0` | `latest` `10.41` `10.41.1d` |
-| [tws-rdesktop][2] |`stable` | `10.37.1l` | `3.23.0` | `stable` `10.37` `10.37.1l` |
+| [tws-rdesktop][2] |`stable` | `10.37.1m` | `3.23.0` | `stable` `10.37` `10.37.1m` |
 
 All tags are available in the container repository for [ib-gateway][1] and
 [tws-rdesktop][2]. IB Gateway and TWS share the same version numbers and tags.
@@ -112,7 +112,7 @@ services:
 
 ```
 
-Create an .env on root directory. Example .env file:
+Create an .env on root directory. You can use the provided [.env-dist](https://github.com/gnzsnz/ib-gateway-docker/blob/master/.env-dist) as a starting point. Example .env file:
 
 ```bash
 TWS_USERID=myTwsAccountName
@@ -164,9 +164,11 @@ Once `docker-compose.yml` and `.env` are in place you can start the container wi
 docker compose up
 ```
 
-To get a GUI can use vnc for ib-gateway or RDP for TWS.
+To get a GUI you can use vnc for ib-gateway or RDP for TWS.
 
-Looking for help? Please keep reading below, or go to [discussion](https://github.com/gnzsnz/ib-gateway-docker/discussions) section for common problems and solutions.
+Looking for help? Please keep reading below, or go to
+[discussion](https://github.com/gnzsnz/ib-gateway-docker/discussions) section for common
+problems and solutions. If you have problems please go through the [troubleshooting guide](https://github.com/gnzsnz/ib-gateway-docker/discussions/245)
 
 ## Configuration
 
@@ -186,6 +188,7 @@ All environment variables are common between ibgateway and TWS image, unless spe
 | `VNC_SERVER_PASSWORD_FILE`  | VNC server password. If not defined, then VNC server will NOT start. Specific to ibgateway, ignored by TWS. | **not defined** (VNC disabled) |
 | `TWOFA_TIMEOUT_ACTION`      | 'exit' or 'restart', set to 'restart if you set `AUTO_RESTART_TIME`. See IBC [documentation](https://github.com/IbcAlpha/IBC/blob/master/userguide.md#second-factor-authentication)  | exit  |
 | `TWOFA_DEVICE` | second factor authentication device. See IBC [documentation](https://github.com/IbcAlpha/IBC/blob/c98d0bcc2ead9b8ab3900a23a707f01f8fd7dfbc/resources/config.ini#L104) | **not defined** |
+| `TWOFA_EXIT_INTERVAL` | It controls how long (in seconds) IBC waits for login to complete after the user acknowledges the second factor authentication. See [IBC documentation](https://github.com/IbcAlpha/IBC/blob/38593af5193ccd634aa226cc66242adc8718b653/resources/config.ini#L147) | 60 seconds |
 | `BYPASS_WARNING` | Settings relate to the corresponding 'Precautions' checkboxes in the API section of the Global Configuration dialog. Accepted values `yes`, `no` if not set, the existing TWS/Gateway configuration is unchanged  | **not defined**                                      |
 | `AUTO_RESTART_TIME`  | time to restart IB Gateway, does not require daily 2FA validation. format hh:mm AM/PM. See IBC [documentation](https://github.com/IbcAlpha/IBC/blob/master/userguide.md#ibc-user-guide) | **not defined**  |
 | `AUTO_LOGOFF_TIME` | Auto-Logoff: at a specified time, TWS shuts down tidily, without restarting   | **not defined**   |

stable/Dockerfile

@@ -5,10 +5,10 @@
 # production image and consume unnecessary space.
 ##############################################################################
 
-# hadolint global ignore=DL3008
+# hadolint global ignore=DL3008,DL4006
 FROM ubuntu:24.04 AS setup
 
-ENV IB_GATEWAY_VERSION=10.37.1l
+ENV IB_GATEWAY_VERSION=10.37.1m
 ENV IB_GATEWAY_CHANNEL=stable
 ENV IBC_VERSION=3.23.0
 ARG DEBIAN_FRONTEND=noninteractive
@@ -66,7 +66,7 @@ COPY ./scripts /root/scripts
 
 FROM ubuntu:24.04
 
-ENV IB_GATEWAY_VERSION=10.37.1l
+ENV IB_GATEWAY_VERSION=10.37.1m
 # IB Gateway user constants
 ARG USER_ID="${USER_ID:-1000}"
 ARG USER_GID="${USER_GID:-1000}"
@@ -90,14 +90,15 @@ COPY --chown=${USER_ID}:${USER_GID} --from=setup /root/ ${HOME}
 RUN apt-get update -y && \
   apt-get upgrade -y && \
   apt-get install --no-install-recommends --yes \
-  gettext-base socat xvfb x11vnc sshpass openssh-client && \
+  gettext-base socat xvfb x11vnc sshpass openssh-client sudo telnet && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* && \
   if id ubuntu; then \
     userdel -rf ubuntu \
   ;fi && \
   groupadd --gid ${USER_GID} ibgateway && \
   useradd -ms /bin/bash --uid ${USER_ID} --gid ${USER_GID} ibgateway && \
+  echo "ibgateway ALL=(ALL) NOPASSWD:ALL" | tee -a /etc/sudoers && \
   chmod a+x ${SCRIPT_PATH}/*.sh
 
 USER ${USER_ID}:${USER_GID}

stable/Dockerfile.tws

@@ -7,7 +7,7 @@
 
 # hadolint global ignore=DL3008
 
-ARG IB_VERSION=10.37.1l
+ARG IB_VERSION=10.37.1m
 FROM ghcr.io/gnzsnz/ib-gateway:${IB_VERSION} AS setup
 
 WORKDIR /
@@ -18,7 +18,7 @@ WORKDIR /
 
 FROM lscr.io/linuxserver/rdesktop:ubuntu-xfce
 
-ENV IB_GATEWAY_VERSION=10.37.1l
+ENV IB_GATEWAY_VERSION=10.37.1m
 ENV IB_GATEWAY_RELEASE_CHANNEL=stable
 ENV IBC_VERSION=3.23.0
 
@@ -43,7 +43,7 @@ RUN \
   apt-get install --no-install-recommends --yes socat sshpass gettext-base \
     libnspr4 libnss3 libcrypto++8 xdg-utils xfce4-cpugraph-plugin \
     xfce4-netload-plugin xfce4-taskmanager xfce4-xkb-plugin xfce4-notes \
-    gvfs gvfs-backends gvfs-fuse && \
+    gvfs gvfs-backends gvfs-fuse telnet && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* # end
 

stable/config/ibc/config.ini.tmpl

@@ -357,7 +357,7 @@ OverrideTwsApiPort=
 # be set dynamically at run-time: most users will never need it,
 # so don't use it unless you know you need it.
 
-OverrideTwsMasterClientID=
+OverrideTwsMasterClientID=${TWS_MASTER_CLIENT_ID}
 
 
 # Read-only Login

stable/scripts/common.sh

@@ -70,6 +70,22 @@ unset_env() {
 	fi
 }
 
+run_scripts() {
+	# run start up scripts
+	_start_scripts=$1
+	if [ ! -d "$_start_scripts" ]; then
+		echo "> No start scripts defined on $_start_scripts"
+		return 0
+	fi
+	echo "> Running start up scripts on $_start_scripts"
+
+	for _f in "${_start_scripts}"/*.sh; do
+		echo "> Running $_f"
+		[ -f "$_f" ] && bash "$_f" || echo "File $_f not found."
+	done
+
+}
+
 set_ports() {
 	# set ports for API and SOCAT
 

stable/scripts/run.sh

@@ -100,6 +100,12 @@ start_process() {
 ###############################################################################
 #####		Common Start
 ###############################################################################
+
+# run start scripts
+if [ -n "$START_SCRIPTS" ]; then
+	run_scripts "$HOME/$START_SCRIPTS"
+fi
+
 # start Xvfb
 start_xvfb
 
@@ -112,6 +118,11 @@ set_java_heap
 # start VNC server
 start_vnc
 
+# run scripts once X environment is up
+if [ -n "$X_SCRIPTS" ]; then
+	run_scripts "$HOME/$X_SCRIPTS"
+fi
+
 ###############################################################################
 #####		Paper, Live or both start process
 ###############################################################################
@@ -168,6 +179,11 @@ if [ "$DUAL_MODE" == "yes" ]; then
 	start_process
 fi
 
+# run scripts once IBC is running
+if [ -n "$IBC_SCRIPTS" ]; then
+	run_scripts "$HOME/$IBC_SCRIPTS"
+fi
+
 trap stop_ibc SIGINT SIGTERM
 wait "${pid[@]}"
 exit $?

stable/tws-scripts/run_tws.sh

@@ -74,6 +74,12 @@ start_process() {
 # user id
 echo ".> Running as user"
 id
+
+# run scripts once X environment is up
+if [ -n "$X_SCRIPTS" ]; then
+	run_scripts "$HOME/$X_SCRIPTS"
+fi
+
 # disable agents
 disable_agents
 # disable compositing
@@ -145,6 +151,11 @@ fi
 # outside if dual mode, to ensure cleanup/unset
 unset_env 'TWS_PASSWORD_PAPER'
 
+# run scripts once IBC is running
+if [ -n "$IBC_SCRIPTS" ]; then
+	run_scripts "$HOME/$IBC_SCRIPTS"
+fi
+
 wait "${pid[@]}"
 _wait="$?"
 echo ".> ************************** End run_tws.sh ******************************** <."

stable/tws-scripts/start_session.sh

@@ -22,6 +22,11 @@ if [ -n "${TZ}" ]; then
 	echo "${TZ}" >/etc/timezone
 fi
 
+# run start scripts
+if [ -n "$START_SCRIPTS" ]; then
+	run_scripts "$HOME/$START_SCRIPTS"
+fi
+
 # open xfce session
 echo ".> Openning Xrdp session"
 _out=$(echo "${_PASS}" | xrdp-sesrun -s 127.0.0.1 -F 0 abc)