Release [email protected]

Signed-off-by: gnzsnz <[email protected]>

Author: gnzsnz

.github/ISSUE_TEMPLATE/bug_report.md

@@ -13,27 +13,37 @@ A clear and concise description of what the bug is.
 
 ## To Reproduce
 
-Steps to reproduce the behavior. Please include information related to docker, ex docker run command, .env file, docker-compose.yml.
+Steps to reproduce the behavior. Please include information related to docker,
+ex docker run command, .env file, docker-compose.yml.
 
 Please provide the output of `docker compose config`
 
-## Expected behavior
+## Expected
+
 A clear and concise description of what you expected to happen.
 
 ## Container logs
-If applicable, add the container logs `docker logs <CONTAINER>` or `docker-compose logs` to help explain your problem.
+
+If applicable, add the container logs `docker logs <CONTAINER>` or
+`docker-compose logs` to help explain your problem.
 
 ## Versions
 
 Please complete the following information:
- - OS: [e.g. Windows]
- - Docker version: [e.g. chrome, safari]
- - Image Tag (`docker image inspect ghcr.io/gnzsnz/ib-gateway:tag`): [e.g. latest]
- - Image Digest (`docker images --digests`): [e.g. sha256:60d9d54009b1b66908bbca1ebf5b8a03a39fe0cb35c2ab4023f6e41b55d17894] 
+
+- OS: [e.g. Windows]
+- Docker version: [e.g. chrome, safari]
+- Image Tag (`docker image inspect ghcr.io/gnzsnz/ib-gateway:tag`): [e.g.
+  latest]
+- Image Digest (`docker images --digests`): [e.g.
+  sha256:60d9d54009b1b66908bbca1ebf5b8a03a39fe0cb35c2ab4023f6e41b55d17894]
 
 ## Additional context
+
 Add any other context about the problem here.
 
 What have you tried and failed.
 
-My primary objective is to fix any bug on the container, ex Dockerfile, run.sh script, docker-compose.yml. Please don't expect upstream issues to be solved here (ex. IB gateway, IBC, etc)
+My primary objective is to fix any bug on the container, ex Dockerfile, run.sh
+script, docker-compose.yml. Please don't expect upstream issues to be solved
+here (ex. IB gateway, IBC, etc)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,14 +7,18 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe
+
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
+
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+## Describe alternatives you've considered
+
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+## Additional context
+
 Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -9,12 +9,12 @@ updates:
     directory: "/stable"
     schedule:
       interval: "daily"
-      
+
   - package-ecosystem: "docker"
     directory: "/latest"
     schedule:
       interval: "daily"
-      
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/detect-ibc-release.yml

@@ -6,12 +6,19 @@ on:
 
   workflow_dispatch:
 
+defaults:
+  run:
+    shell: "bash -Eeuo pipefail -x {0}"
+
 env:
   IBC_REPO: https://github.com/IbcAlpha/IBC.git
   BRANCH_PREFIX: IBC-update
 jobs:
   detect-release:
+    name: Detect Release
     runs-on: ubuntu-latest
+    outputs:
+      update: ${{ steps.verify_latest.outputs.update }}
     strategy:
       fail-fast: true
 
@@ -23,9 +30,11 @@ jobs:
         run: |
           CURRENT_IBC="$(grep 'ENV IBC_VERSION' Dockerfile.template|cut -d '=' -f 2)"
           echo "CURRENT_IBC=$CURRENT_IBC" >> $GITHUB_OUTPUT
-      
+
       - name: Get IBC latest version
         id: ibc_version
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           IBC_LATEST="$(gh release list -R ${{ env.IBC_REPO }} --exclude-drafts --exclude-pre-releases |grep 'Latest'|cut -f1)"
           if [ -n ${IBC_LATEST} ]
@@ -76,7 +85,7 @@ jobs:
           git config user.email [email protected]
           git pull
           git checkout -b "$branch" origin/master
-          
+
           # update Dockerfile.template, but don't run update.sh
           # next ib gateway release will run update.sh
           sed -i "s/IBC_VERSION=${ver}/IBC_VERSION=${latest}/g" Dockerfile.template
@@ -85,5 +94,16 @@ jobs:
           git commit -m "Update IBC from ${ver} to ${latest}"
           git push --set-upstream origin "$branch"
 
-          gh pr create --base master --fill          
+          gh pr create --base master --fill
+
 
+  build:
+    name: Call build workflow
+    needs: detect-release
+    if: needs.detect-release.outputs.update == 'true'
+    strategy:
+      matrix:
+        channel: ['stable', 'latest']
+    uses: gnzsnz/ib-gateway-docker/.github/workflows/build.yml@master
+    with:
+        channel: ${{ matrix.channel }}

.github/workflows/detect-releases.yml

@@ -13,6 +13,9 @@ defaults:
 jobs:
   detect-release:
     runs-on: ubuntu-latest
+    outputs:
+      update: ${{ steps.check-update.outputs.has_update }}
+      channel: ${{ matrix.channel }}
     strategy:
       fail-fast: true
       matrix:
@@ -112,3 +115,12 @@ jobs:
           git push --set-upstream origin "$t_branch"
 
           gh pr create --base master --fill
+
+
+  build:
+    name: Call build workflow
+    needs: detect-release
+    if: needs.detect-release.outputs.update == 'true'
+    uses: gnzsnz/ib-gateway-docker/.github/workflows/build.yml@master
+    with:
+        channel: ${{ needs.detect-release.outputs.channel }}

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: "Publish Docker"
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
 
 jobs:
   publish-docker:
@@ -23,22 +23,11 @@ jobs:
           echo "channel=$channel" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3          
-          
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/gnzsnz/ib-gateway
-            gnzsnz/ib-gateway
-          flavor: |
-            latest=false
-          tags: |
-            type=match,pattern=v(\d+.\d+),group=1
-            type=match,pattern=v(\d+.\d+.\w+),group=1
-            type=match,pattern=v(\d+.\d+.\w+)+\-(stable|latest),group=2
+        uses: docker/setup-buildx-action@v3
 
+      ###############################################################
+      #   Login container registry
+      ###############################################################
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
@@ -51,8 +40,26 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          
-      - name: Build and push
+
+      ###############################################################
+      #   Build ibgateway
+      ###############################################################
+
+      - name: Docker meta ibgateway
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/gnzsnz/ib-gateway
+            gnzsnz/ib-gateway
+          flavor: |
+            latest=false
+          tags: |
+            type=match,pattern=v(\d+.\d+),group=1
+            type=match,pattern=v(\d+.\d+.\w+),group=1
+            type=match,pattern=v(\d+.\d+.\w+)+\-(stable|latest),group=2
+
+      - name: Build and push ibgateway
         uses: docker/build-push-action@v5
         with:
           context: ${{ steps.channel.outputs.channel }}
@@ -61,3 +68,32 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+      ###############################################################
+      #   Build tws
+      ###############################################################
+
+      - name: Docker meta TWS
+        id: meta-tws
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/gnzsnz/tws-rdesktop
+            gnzsnz/tws-rdesktop
+          flavor: |
+            latest=false
+          tags: |
+            type=match,pattern=v(\d+.\d+),group=1
+            type=match,pattern=v(\d+.\d+.\w+),group=1
+            type=match,pattern=v(\d+.\d+.\w+)+\-(stable|latest),group=2
+
+      - name: Build and push TWS
+        uses: docker/build-push-action@v5
+        with:
+            context: ${{ steps.channel.outputs.channel }}
+            file: ${{ steps.channel.outputs.channel }}/Dockerfile.tws
+            cache-from: type=gha
+            cache-to: type=gha,mode=max
+            push: true
+            tags: ${{ steps.meta-tws.outputs.tags }}
+            labels: ${{ steps.meta-tws.outputs.labels }}

.gitignore

@@ -1,3 +1,5 @@
 /.env
 tws_settings/
 ssh/
+/config/
+.python-version

.pre-commit-config.yaml

@@ -1,29 +1,29 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
-  hooks:
-  - id: trailing-whitespace
-  - id: end-of-file-fixer
-  - id: check-yaml
-  - id: check-added-large-files
-  - id: check-shebang-scripts-are-executable
-  - id: check-executables-have-shebangs
-- repo: https://github.com/jumanjihouse/pre-commit-hooks
-  rev: 3.0.0
-  hooks:
-  - id: shellcheck
-  - id: shfmt
-- repo: https://github.com/hadolint/hadolint
-  rev: v2.12.1-beta
-  hooks:
-  - id: hadolint
-- repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.39.0
-  hooks:
-  - id: markdownlint
-- repo: https://github.com/wemake-services/dotenv-linter
-  rev: 0.5.0 # Use the ref you want to point at
-  hooks:
-  - id: dotenv-linter
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+      - id: check-shebang-scripts-are-executable
+      - id: check-executables-have-shebangs
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 3.0.0
+    hooks:
+      - id: shellcheck
+      - id: shfmt
+  - repo: https://github.com/hadolint/hadolint
+    rev: v2.12.0
+    hooks:
+      - id: hadolint-docker
+  - repo: https://github.com/igorshubovych/markdownlint-cli
+    rev: v0.37.0
+    hooks:
+      - id: markdownlint
+  - repo: https://github.com/wemake-services/dotenv-linter
+    rev: 0.4.0  # Use the ref you want to point at
+    hooks:
+      - id: dotenv-linter

Dockerfile.template

@@ -1,7 +1,7 @@
 ##############################################################################
 # Setup Stage: install apps
 #
-# This is a dedicated stage so that donwload archives don't end up on 
+# This is a dedicated stage so that donwload archives don't end up on
 # production image and consume unnecessary space.
 ##############################################################################
 
@@ -53,14 +53,17 @@ ENV IB_GATEWAY_VERSION=$VERSION
 ARG USER_ID="${USER_ID:-1000}"
 ARG USER_GID="${USER_GID:-1000}"
 # IBC env vars
+ENV HOME=/home/ibgateway
 ENV TWS_MAJOR_VRSN=${IB_GATEWAY_VERSION}
-ENV TWS_PATH=/home/ibgateway/Jts
+ENV TWS_PATH=${HOME}/Jts
 ENV TWS_INI=jts.ini
-ENV IBC_PATH=/home/ibgateway/ibc
-ENV IBC_INI=/home/ibgateway/ibc/config.ini
+ENV IBC_PATH=${HOME}/ibc
+ENV IBC_INI=${HOME}/ibc/config.ini
+ENV SCRIPT_PATH=${HOME}/scripts
+ENV GATEWAY_OR_TWS=gateway
 # Copy files
 COPY --from=setup /usr/local/i4j_jres/ /usr/local/i4j_jres
-COPY --chown=${USER_ID}:${USER_GID} --from=setup /root/ /home/ibgateway/
+COPY --chown=${USER_ID}:${USER_GID} --from=setup /root/ ${HOME}
 
 # Prepare system
 RUN apt-get update -y && \
@@ -70,10 +73,10 @@ RUN apt-get update -y && \
   rm -rf /var/lib/apt/lists/* && \
   groupadd --gid ${USER_GID} ibgateway && \
   useradd -ms /bin/bash --uid ${USER_ID} --gid ${USER_GID} ibgateway && \
-  chmod a+x /home/ibgateway/scripts/*.sh
+  chmod a+x ${SCRIPT_PATH}/*.sh
 
 USER ${USER_ID}:${USER_GID}
-WORKDIR /home/ibgateway/
+WORKDIR ${HOME}
 
 # Start run script
 CMD ["/home/ibgateway/scripts/run.sh"]