Ingress addition

binance-trading-bot/CHANGELOG.md

@@ -1,112 +1 @@
-- Add NTFS support
+- First version
-- Disable external port by default
-- WARNING : update to supervisor 2022.11 before installing
-
-## 2.23.0 (08-11-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.22.4 (23-07-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.22.3 (07-07-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.22.2 (05-07-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.22.1 (09-06-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.22.0 (06-06-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Add codenotary sign
-
-## 2.21.1 (23-02-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.21.0 (22-02-2022)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Cleanup: config base folder changed to /config/addons_config (thanks @bruvv)
-
-## 2.20.1 (23-12-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Mount ssl in write
-- New standardized logic for Dockerfile build and packages installation
-- Mount nvme drives
-
-## 2.19.0 (25-11-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Allow mounting local drives by label. Just pust the label instead of sda1 for example
-
-## 2.18.0 (02-11-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Allow mounting of devices up to sdg2
-- Allow uploads >16mb
-- Allow local mount in protected mode
-- SMB : accepts several disks separated by commas mounted in /mnt/$sharename
-
-## 2.17.2 (28-08-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.17.1 (26-08-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.17.0 (24-08-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.16.1 (07-08-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Ingress added
-- No auth option made more apparent
-
-## 2.16.0 (29-07-2021)
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Add banner in log
-- Update smb mount code
-- Allow mount local drives (needs priviledged mode)
-
-## 2.15.0
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.14.1
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.13.0
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.12.1
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-
-## 2.12.0
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Allow mounting shares named \ip\share in addition to //ip/share
-
-## 2.11.0
-
-- Update to latest version from hurlenko/binance-trading-bot-docker
-- Added ssl
-- New feature : mount smb share in protected mode
-- New feature : mount multiple smb shares
-- New config/feature : mount smbv1
-- Changed path : changed smb mount path from /storage/externalcifs to /mnt/$NAS name

binance-trading-bot/Dockerfile

@@ -72,7 +72,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     && chmod -R 755 /etc/cont-init.d
 
 # Manual apps
-ENV PACKAGES="sudo redis"
+ENV PACKAGES="sudo redis nginx"
 
 # Automatic apps & bashio
 # hadolint ignore=SC2015

binance-trading-bot/README.md

@@ -21,6 +21,8 @@ _Thanks to everyone having starred my repo! To star it click on the image below,
 Automated Binance trading bot - Trade multiple cryptocurrencies. Buy low/sell high with Grid Trading. Integrated with TradingView technical analysis.
 This addon is based on https://github.com/chrisleekr/binance-trading-bot.
 
+This is a test app ; for any issues please contact the link above.
+
 ## Configuration
 
 Webui can be found at <http://your-ip:80>.

binance-trading-bot/config.json

@@ -1,46 +1,10 @@
 {
   "arch": [
     "aarch64",
-    "amd64",
+    "amd64"
-    "armv7"
   ],
   "codenotary": "alexandrep.github@gmail.com",
   "description": "Automated Binance trading bot - Trade multiple cryptocurrencies. Buy low/sell high with Grid Trading. Integrated with TradingView technical analysis",
-  "devices": [
-    "/dev/sda",
-    "/dev/sdb",
-    "/dev/sdc",
-    "/dev/sdd",
-    "/dev/sde",
-    "/dev/sdf",
-    "/dev/sdg",
-    "/dev/nvme",
-    "/dev/nvme0n1p1",
-    "/dev/nvme0n1p2",
-    "/dev/mmcblk",
-    "/dev/fuse",
-    "/dev/sda1",
-    "/dev/sdb1",
-    "/dev/sdc1",
-    "/dev/sdd1",
-    "/dev/sde1",
-    "/dev/sdf1",
-    "/dev/sdg1",
-    "/dev/sda2",
-    "/dev/sdb2",
-    "/dev/sdc2",
-    "/dev/sdd2",
-    "/dev/sde2",
-    "/dev/sdf2",
-    "/dev/sdg2",
-    "/dev/sda3",
-    "/dev/sdb3",
-    "/dev/sda4",
-    "/dev/sdb4",
-    "/dev/nvme0",
-    "/dev/nvme1",
-    "/dev/nvme2"
-  ],
   "environment": {
     "BINANCE_REDIS_HOST": "localhost",
     "BINANCE_REDIS_PORT": "6379",
@@ -49,6 +13,8 @@
     "TRADINGVIEW_LOG_LEVEL": "INFO"
   },
   "image": "ghcr.io/alexbelgium/binance_trading_bot-{arch}",
+  "ingress": true,
+  "ingress_stream": true,
   "map": [
     "config:rw"
   ],
@@ -59,11 +25,14 @@
     "BINANCE_AUTHENTICATION_ENABLED": true,
     "BINANCE_AUTHENTICATION_PASSWORD": null
   },
+  "panel_icon": "mdi:bitcoin",
   "ports": {
-    "80/tcp": 8081
+    "80/tcp": 8081,
+    "8080/tcp": 8082
   },
   "ports_description": {
-    "80/tcp": "Webui port"
+    "80/tcp": "Web UI port",
+    "8080/tcp": "Trading View port"
   },
   "privileged": [
     "SYS_ADMIN",
@@ -86,6 +55,5 @@
   },
   "slug": "binance-trading-bot",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "2.23.0-5",
+  "version": "0.0.96"
-  "webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
+}
-}

binance-trading-bot/rootfs/etc/cont-init.d/32-ingress.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/bashio
+# shellcheck shell=bash
+
+#################
+# NGINX SETTING #
+#################
+declare ingress_interface
+declare ingress_port
+
+ingress_port="$(bashio::addon.ingress_port)"
+ingress_interface="$(bashio::addon.ip_address)"
+ingress_entry=$(bashio::addon.ingress_entry)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
+sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf
+

binance-trading-bot/rootfs/etc/cont-init.d/99-run.sh

@@ -25,5 +25,9 @@ npm start docker-entrypoint.sh & bashio::log.info "Starting binance bot"
 #########################
 # Starting Trading View #
 #########################
-bashio::log.info "Starting trading view"
+python main.py & bashio::log.info "Starting trading view"
-python main.py
+
+##################
+# Starting nginx #
+##################
+nginx

binance-trading-bot/rootfs/etc/nginx/includes/mime.types

@@ -0,0 +1,96 @@
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

binance-trading-bot/rootfs/etc/nginx/includes/proxy_params.conf

@@ -0,0 +1,15 @@
+proxy_http_version          1.1;
+proxy_ignore_client_abort   off;
+proxy_read_timeout          86400s;
+proxy_redirect              off;
+proxy_send_timeout          86400s;
+proxy_max_temp_file_size    0;
+
+proxy_set_header Host $host;
+proxy_set_header Accept-Encoding "";
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-NginX-Proxy true;
+proxy_set_header X-Real-IP $remote_addr;

binance-trading-bot/rootfs/etc/nginx/includes/resolver.conf

@@ -0,0 +1 @@
+resolver 127.0.0.11;

binance-trading-bot/rootfs/etc/nginx/includes/server_params.conf

@@ -0,0 +1,5 @@
+server_name     $hostname;
+
+add_header X-Content-Type-Options nosniff;
+add_header X-XSS-Protection "1; mode=block";
+add_header X-Robots-Tag none;

binance-trading-bot/rootfs/etc/nginx/includes/ssl_params.conf

@@ -0,0 +1,9 @@
+ssl_protocols TLSv1.2;
+ssl_prefer_server_ciphers on;
+ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
+ssl_ecdh_curve secp384r1;
+ssl_session_timeout  10m;
+ssl_session_cache shared:SSL:10m;
+ssl_session_tickets off;
+ssl_stapling on;
+ssl_stapling_verify on;

binance-trading-bot/rootfs/etc/nginx/nginx.conf

@@ -0,0 +1,55 @@
+# Run nginx in foreground.
+daemon off;
+
+# This is run inside Docker.
+user root;
+
+# Pid storage location.
+pid /var/run/nginx.pid;
+
+# Set number of worker processes.
+worker_processes 1;
+
+# Enables the use of JIT for regular expressions to speed-up their processing.
+pcre_jit on;
+
+# Write error log to Hass.io add-on log.
+error_log /proc/1/fd/1 error;
+
+# Load allowed environment vars
+env HASSIO_TOKEN;
+
+# Load dynamic modules.
+include /etc/nginx/modules/*.conf;
+
+# Max num of simultaneous connections by a worker process.
+events {
+    worker_connections 512;
+}
+
+http {
+    include /etc/nginx/includes/mime.types;
+
+    log_format hassio '[$time_local] $status '
+                        '$http_x_forwarded_for($remote_addr) '
+                        '$request ($http_user_agent)';
+
+    access_log              /proc/1/fd/1 hassio;
+    client_max_body_size    4G;
+    default_type            application/octet-stream;
+    gzip                    on;
+    keepalive_timeout       65;
+    sendfile                on;
+    server_tokens           off;
+    tcp_nodelay             on;
+    tcp_nopush              on;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    include /etc/nginx/includes/resolver.conf;
+
+    include /etc/nginx/servers/*.conf;
+}

binance-trading-bot/rootfs/etc/nginx/servers/ingress.conf

@@ -0,0 +1,18 @@
+server {
+    listen %%interface%%:%%port%% default_server;
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/proxy_params.conf;
+    client_max_body_size 0;
+
+location / {
+    proxy_pass                  http://127.0.0.1:80;
+    proxy_http_version          1.1;
+    proxy_set_header            Upgrade $http_upgrade;
+    proxy_set_header            Connection $connection_upgrade;
+    sub_filter_once             off;
+    sub_filter_types            *;
+    proxy_set_header            Accept-Encoding "";
+    sub_filter                  "location.port!==80?':'+location.port:''}" "location.port!==80?':'+location.port:''}%%ingress_entry%%/";
+    sub_filter                  /auth    %%ingress_entry%%/auth;
+  }
+}