restructured repo

.github/workflows/deploy.yml

@@ -23,8 +23,8 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
-          context: services/metatrader/
-          file: services/metatrader/Dockerfile.mt5
+          context: metatrader-5/
+          file: metatrader-5/Dockerfile.mt5
           platforms: linux/amd64
           push: true
           tags: fortesenselabs/metatrader:lastest,fortesenselabs/metatrader:5

Makefile

@@ -1,8 +1,7 @@
 NAMESPACE=metatrader-terminal
 
-
 build:
-	docker build -f Dockerfile.mt5 -t fortesenselabsmt .
+	docker build -f metatrader-5/Dockerfile.mt5 -t fortesenselabsmt metatrader-5/
 
 run: build
 	docker run --rm -dit -p 5900:5900 -p 8000:8000 --name fortesenselabsmt -v fortesenselabsmt:/data fortesenselabsmt

services/metatrader/README.md → README.md

@@ -1,4 +1,4 @@
-![example workflow](https://github.com/FortesenseLabs/metatrader-terminal/actions/workflows/deploy-metatrader-terminal-image.yml/badge.svg)
+![example workflow](https://github.com/FortesenseLabs/metatrader-terminal/actions/workflows/deploy.yml/badge.svg)
 
 # MetaTrader (with vnc-alpine)
 
@@ -88,6 +88,10 @@ login to shell
  make shell
 ```
 
+## TODOS
+
+- write a client in python (can follow the python-binance format)
+
 ## Resources
 
 - https://github.com/AwesomeTrading/Backtrader-MQL5-API

Tiltfile

@@ -2,9 +2,7 @@
 load('ext://namespace', 'namespace_create', 'namespace_inject')
 namespace_create('metatrader-terminal')
 
-docker_build('metatrader', 'services/metatrader', dockerfile = 'services/metatrader/Dockerfile.mt5')
-docker_build('exchange', 'services/exchange', dockerfile = 'services/exchange/Dockerfile.dev')
-
+docker_build('metatrader', 'metatrader-5', dockerfile = 'metatrader-5/Dockerfile.mt5')
 
 yaml = helm(
   'infrastructure/k8s',
@@ -20,7 +18,7 @@ yaml = helm(
 
 k8s_yaml(yaml)
 
-k8s_resource('metatrader', port_forwards=['5900', '8000'])
+k8s_resource('metatrader', port_forwards=['5900', '5901', '8000'])
 k8s_resource('db', port_forwards='5432')
 
 

infrastructure/k8s/env.example.yaml

@@ -5,11 +5,6 @@ env:
     MT5_SERVER: login-server
     MT_FILES_DIR: EA-expert-file-location
     DATABASE_URL: postgresql://user:password@db.metatrader-terminal/database?sslmode=disable
-  exchange:
-    BINANCE_TESTNET: true
-    BINANCE_API_KEY: YOUR_BINANCE_API_KEY
-    BINANCE_SECRET_KEY: YOUR_BINANCE_SECRET_KEY
-    DATABASE_URL: postgresql://user:password@db.metatrader-terminal/database?sslmode=disable
   db:
     POSTGRES_USER: user
     POSTGRES_PASSWORD: password

infrastructure/k8s/templates/metatrader.yaml

@@ -46,11 +46,5 @@ spec:
               value: "{{ .Values.env.metatrader.MT5_SERVER }}"
             - name: MT_FILES_DIR
               value: "{{ .Values.env.metatrader.MT_FILES_DIR }}"
-            - name: NATS_URL
-              value: "{{ .Values.env.metatrader.NATS_URL }}"
-            - name: NATS_USER
-              value: "{{ .Values.env.nats.USER }}"
-            - name: NATS_PASS
-              value: "{{ .Values.env.nats.PASS }}"
             - name: DATABASE_URL
               value: "{{ .Values.env.metatrader.DATABASE_URL }}"

infrastructure/k8s/values.yaml

@@ -3,4 +3,3 @@ imagePullSecret: metatrader-terminal-config
 images:
   db: postgres:13
   metatrader: metatrader
-  exchange: exchange