Update to IB Gateway 978.2b and updates to deploy to Kubernetes using a Helm 3 chart

.github/workflows/docker-image.yml

@@ -0,0 +1,16 @@
+name: Docker Image CI
+
+on:
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

.github/workflows/docker-publish.yml

@@ -0,0 +1,57 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - v*
+
+  pull_request:
+
+env:
+  IMAGE_NAME: ib-gateway-docker
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3.3.0
+
+        with:
+          fetch-depth: 0
+
+      - name: Get version from tag
+        id: version
+        run: echo "name=version::$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_OUTPUT
+
+      - name: Set up semantic versioning
+        id: semver
+        uses: paulhatch/semantic-version@v5.0.3
+
+        with:
+          bump: patch
+          version: ${{ steps.version.outputs.version }}
+
+      - name: Build Docker image
+        run: docker build . --file Dockerfile --tag "ghcr.io/${{ github.repository }}/${{ env.IMAGE_NAME }}:${{ steps.semver.outputs.version }}"
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2.1.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Tag and push Docker image
+        if: github.event_name == 'push'
+        id: push-image
+        run: |
+          docker push "ghcr.io/${{ github.repository }}/${{ env.IMAGE_NAME }}:${{ steps.semver.outputs.version }}"
+
+          echo "name=image-url::ghcr.io/${{ github.repository }}/${{ env.IMAGE_NAME }}:${{ steps.semver.outputs.version }}" >> $GITHUB_OUTPUT
+          echo "name=image-tag::${{ steps.semver.outputs.version }}" >> $GITHUB_OUTPUT
+

.gitignore

@@ -14,3 +14,4 @@ Logs/*
 node_modules/
 
 *.local
+.env*

Dockerfile

@@ -1,56 +1,102 @@
-FROM ubuntu:16.04
-
-LABEL maintainer="Mike Ehrenberg <mvberg@gmail.com>"
-
-RUN  apt-get update \
-  && apt-get install -y wget \
-  && apt-get install -y unzip \
-  && apt-get install -y xvfb \
-  && apt-get install -y libxtst6 \
-  && apt-get install -y libxrender1 \
-  && apt-get install -y libxi6 \
-	&& apt-get install -y x11vnc \
-  && apt-get install -y socat \
-  && apt-get install -y software-properties-common \
-  && apt-get install -y dos2unix
-
-# Setup IB TWS
-RUN mkdir -p /opt/TWS
-WORKDIR /opt/TWS
-RUN wget -q http://cdn.quantconnect.com/interactive/ibgateway-latest-standalone-linux-x64-v974.4g.sh
-RUN chmod a+x ibgateway-latest-standalone-linux-x64-v974.4g.sh
-
-# Setup  IBController
-RUN mkdir -p /opt/IBController/ && mkdir -p /opt/IBController/Logs
-WORKDIR /opt/IBController/
-RUN wget -q http://cdn.quantconnect.com/interactive/IBController-QuantConnect-3.2.0.5.zip
-RUN unzip ./IBController-QuantConnect-3.2.0.5.zip
-RUN chmod -R u+x *.sh && chmod -R u+x Scripts/*.sh
+FROM ubuntu:22.04
 
-WORKDIR /
+# Set defaults for environment variables
+ENV TZ=America/Chicago
+ENV VNC_PASSWORD=1234
+ENV TWS_MAJOR_VRSN=${IB_GATEWAY_INSTVER}
+ENV IBC_INI=/opt/IBController/IBController.ini
+ENV IBC_PATH=/opt/IBController
+ENV TWS_PATH=/root/Jts
+ENV TWS_CONFIG_PATH=/root/Jts
+ENV SOCAT_LISTEN_PORT=5003
+ENV SOCAT_DEST_PORT=4003
+ENV SOCAT_DEST_ADDR=127.0.0.1
+ENV HEALTHCHECK_CLIENTID=990
+ENV HEALTHCHECK_LISTEN_PORT=4002
+ENV HEALTHCHECK_IP=127.0.0.1
+ENV IBAPI_VERSION=1030.01
+ENV USER=root
+
+LABEL maintainer="forhire"
+
+ARG DEBIAN_FRONTEND=noninteractive
+ARG IB_GATEWAY_VERSION=stable-standalone
+ARG IB_CONTROLLER_VERSION=3.22.0
+ARG IB_GATEWAY_INSTVER=stable-standalone
 
-# Install TWS
-RUN yes n | /opt/TWS/ibgateway-latest-standalone-linux-x64-v974.4g.sh
+# https://github.com/IbcAlpha/IBC/releases/download/3.19.0/IBCLinux-3.19.0.zip
+
+# Install necessary packages
+RUN set -x && apt-get update && \
+    apt-get install -y wget unzip xvfb libxtst6 libxrender1 libxi6 xinit \
+    x11vnc tightvncserver socat software-properties-common iproute2 ncat python3-pip \
+    xfonts-base \
+    xfonts-100dpi \
+    xfonts-75dpi \
+    xfonts-scalable \
+    xfonts-cyrillic \
+    xinit \
+    && rm -rf /var/lib/apt/lists/*
+# https://download2.interactivebrokers.com/installers/ibgateway/latest-standalone/ibgateway-latest-standalone-linux-x64.sh
+# Setup IB TWS and IBController
+RUN set -x && \
+    mkdir -p /opt/TWS && \
+    cd /opt/TWS && \
+    wget https://download2.interactivebrokers.com/installers/ibgateway/${IB_GATEWAY_VERSION}/ibgateway-${IB_GATEWAY_VERSION}-linux-x64.sh && \
+    chmod a+x ibgateway-${IB_GATEWAY_VERSION}-linux-x64.sh && \
+    mkdir -p /opt/TWS/twsapi && \
+    cd /opt/TWS/twsapi && \
+    wget https://interactivebrokers.github.io/downloads/twsapi_macunix.${IBAPI_VERSION}.zip && \
+    unzip twsapi_macunix.${IBAPI_VERSION}.zip && \
+    cd IBJts/source/pythonclient && \
+    python3 -m pip install wheel && \
+    python3 setup.py bdist_wheel && \
+    WHLFILE=`find . -name '*.whl' -type f` && \
+    python3 -m pip install --user --upgrade ${WHLFILE} && \
+    cd /opt/TWS && \
+    rm twsapi/twsapi_macunix.${IBAPI_VERSION}.zip && \
+    printf "/root/Jts/ibgateway/${IB_GATEWAY_INSTVER}\n\n" | ./ibgateway-${IB_GATEWAY_VERSION}-linux-x64.sh && \
+    rm ibgateway-${IB_GATEWAY_VERSION}-linux-x64.sh && \
+    mkdir -p /opt/IBController/Logs && \
+    cd /opt/IBController/ && \
+    wget -q https://github.com/IbcAlpha/IBC/releases/download/${IB_CONTROLLER_VERSION}/IBCLinux-${IB_CONTROLLER_VERSION}.zip && \
+    unzip IBCLinux-${IB_CONTROLLER_VERSION}.zip && \
+    rm IBCLinux-${IB_CONTROLLER_VERSION}.zip && \
+    chmod -R u+x ./*.sh ./scripts/*.sh
+
+WORKDIR /
 
+# Set display environment variable
 ENV DISPLAY :0
 
-ADD runscript.sh runscript.sh
-ADD ./vnc/xvfb_init /etc/init.d/xvfb
-ADD ./vnc/vnc_init /etc/init.d/vnc
-ADD ./vnc/xvfb-daemon-run /usr/bin/xvfb-daemon-run
+COPY runscript.sh /
+COPY healthcheck.py /
+COPY vnc/xvfb_init /etc/init.d/xvfb
+COPY vnc/vnc_init /etc/init.d/vnc
+COPY vnc/xvfb-daemon-run /usr/bin/xvfb-daemon-run
 
-RUN chmod -R u+x runscript.sh \
-  && chmod -R 777 /usr/bin/xvfb-daemon-run \
-  && chmod 777 /etc/init.d/xvfb \
-  && chmod 777 /etc/init.d/vnc
+USER root
 
-RUN dos2unix /usr/bin/xvfb-daemon-run \
-  && dos2unix /etc/init.d/xvfb \
-  && dos2unix /etc/init.d/vnc \
-  && dos2unix runscript.sh
+RUN chmod -R u+x /runscript.sh && \
+    chmod -R 755 /usr/bin/xvfb-daemon-run && \
+    chmod 755 /etc/init.d/xvfb && \
+    chmod 755 /etc/init.d/vnc
+
+#USER nobody
 
 # Below files copied during build to enable operation without volume mount
-COPY ./ib/IBController.ini /root/IBController/IBController.ini
-COPY ./ib/jts.ini /root/Jts/jts.ini
+COPY ib/IBController.ini /opt/IBController/IBController.ini
+
+HEALTHCHECK --interval=30s --timeout=10s --retries=3 \
+  CMD /healthcheck.py -a ${HEALTHCHECK_IP} -p ${HEALTHCHECK_LISTEN_PORT} -c ${HEALTHCHECK_CLIENTID} -r 1
+
+# Expose VNC port
+EXPOSE 5900
+
+# Expose IB Gateway API port
+EXPOSE ${SOCAT_DEST_PORT}
+
+# Expose API port
+EXPOSE ${SOCAT_LISTEN_PORT}
 
-CMD bash runscript.sh
+CMD /bin/bash runscript.sh

README.md

@@ -1,13 +1,16 @@
 # Interactive Brokers Gateway Docker
 
-IB Gateway running in Docker with [IB Controller](https://github.com/ib-controller/ib-controller/) and VNC
+IB Gateway running in Docker with [IBC](https://github.com/IbcAlpha/IBC/) and VNC
 
-* TWS Gateway: v974.4g
-* IB Controller: v3.2.0
+* TWS Gateway: 10.30.01
+* IBC: 3.22.0
 
-### Docker Hub image
+### Docker container image
 
-* https://hub.docker.com/r/mvberg/ib-gateway-docker
+* ghcr.io/forhire/ib-gateway-docker/ib-gateway-docker:VERSIONTAG
+
+### HELM3 chart for deploying to Kubernetes
+* https://github.com/forhire/ibgw
 
 ### Getting Started
 
@@ -55,14 +58,6 @@ Please do not open your box to the internet.
 
 ![vnc](docs/ib_gateway_vnc.jpg)
 
-### Demo Accounts
-
-It seems that all of the `demo` accounts are dead for good:
-
-* edemo
-* fdemo
-* pmdemo
-
 ### Troubleshooting
 
 Sometimes, when running in non-daemon mode, you will see this:

docker-compose.yml

@@ -1,27 +1,42 @@
-version: '2'
+version: '3'
 services:
   tws:
+    image: ib-gateway-docker_tws:latest
+    ports:
+      - "7496:5003"
+      - "4001:5003"
+      - "4002:5003"
+      - "4003:5003"
+      - "5902:5900"
     build: .
     ports:
-      - "4003:4003"
-      - "5901:5900"
+      - "4003:5003"
+      - "5902:5900"
     volumes:
-      - ./ib/IBController.ini:/root/IBController/IBController.ini
-      - ./ib/jts.ini:/root/Jts/jts.ini
+      - ib-controller:/opt/IBController
+      - ib-jts:/root/Jts
     environment:
       - TZ=America/Chicago
       # Variables pulled from /IBController/IBControllerGatewayStart.sh
       - VNC_PASSWORD=1234 # CHANGEME
-      - TWS_MAJOR_VRSN=974
-      - IBC_INI=/root/IBController/IBController.ini
+      - TWS_MAJOR_VRSN=stable-standalone
+      - IBC_INI=/opt/IBController/IBController.ini
       - IBC_PATH=/opt/IBController
       - TWS_PATH=/root/Jts
       - TWS_CONFIG_PATH=/root/Jts
       - LOG_PATH=/opt/IBController/Logs
-      - JAVA_PATH=/opt/i4j_jres/1.8.0_152/bin # JRE is bundled starting with TWS 952 
+      - JAVA_PATH=/opt/i4j_jres/1.8.0_152-tzdata2019c/bin # JRE is bundled starting with TWS 952 
       - TRADING_MODE=paper # either paper or live
       - TWSUSERID=fdemo # IB account
       - TWSPASSWORD=demouser # IB account password
       - FIXUSERID=
       - FIXPASSWORD=
-      - APP=GATEWAY
+      - APP=GATEWAY
+      - SOCAT_LISTEN_PORT=5003
+      - SOCAT_DEST_PORT=4003 # paper = 4002, live 4003
+      - SOCAT_DEST_ADDR=127.0.0.1
+
+volumes:
+  ib-controller:
+  ib-jts:
+