Merge branch 'v3-dev' of github.com:runcitadel/apps into v3-dev

apps/bitcartcc/app.yml

@@ -4,7 +4,7 @@ version: 3
 metadata:
   category: Payments
   name: BitcartCC
-  version: 0.6.5.1
+  version: 0.6.9.1
   tagline: BitcartCC is a self-hosted payment processor and developer solutions
     platform for cryptocurrencies
   description: BitcartCC provides light-weight, but secure and easy-to-use
@@ -17,6 +17,9 @@ metadata:
     - 1.png
     - 2.png
     - 3.png
+  dependencies:
+    - electrum
+  path: /help/
 containers:
   - name: admin
     restart: unless-stopped
@@ -24,7 +27,11 @@ containers:
     command: yarn start
     environment:
       BITCART_ADMIN_LOG_FILE: bitcart.log
-      BITCART_ADMIN_API_URL: http://$APP_BITCARTCC_BACKEND_IP:8000
+      BITCART_ADMIN_API_URL: http://$APP_DOMAIN:$APP_BITCARTCC_MAIN_PORT/api
+      BITCART_ADMIN_ROOTPATH: /admin
+      BITCART_ADMIN_SOCKS_PROXY: socks5h://$TOR_PROXY_IP:$TOR_PROXY_PORT
+      BITCART_ADMIN_ONION_API_URL: http://$APP_HIDDEN_SERVICE/api
+      BITCART_ADMIN_ONION_HOST: http://$APP_HIDDEN_SERVICE
   - name: backend
     depends_on:
       - bitcoin
@@ -32,36 +39,41 @@ containers:
       - redis
     restart: unless-stopped
     image: bitcartcc/bitcart:stable
-    entrypoint: /usr/local/bin/docker-entrypoint.sh
     command: bash -c "alembic upgrade head && gunicorn -c gunicorn.conf.py main:app"
     environment:
       IN_DOCKER: false
       LOG_FILE: bitcart.log
       BITCART_DATADIR: /datadir
+      BITCART_BACKUPS_DIR: /backups
+      BITCART_VOLUMES: /datadir /backups
       BTC_NETWORK: $BITCOIN_NETWORK
       BTC_LIGHTNING: true
       REDIS_HOST: redis://$APP_BITCARTCC_REDIS_IP
       DB_HOST: $APP_BITCARTCC_DATABASE_IP
-    user: 1000:1000
+      BTC_HOST: $APP_BITCARTCC_BITCOIN_IP
+      BITCART_BACKEND_ROOTPATH: /api
     data:
       - data/bitcart:/datadir
+      - data/backups:/backups
   - name: bitcoin
     restart: unless-stopped
     image: bitcartcc/bitcart-btc:stable
     environment:
+      BTC_HOST: $APP_BITCARTCC_BITCOIN_IP
       BTC_NETWORK: $BITCOIN_NETWORK
       BTC_LIGHTNING: true
-      IN_DOCKER: false
+      BTC_SERVER: $ELECTRUM_IP:$ELECTRUM_PORT:t
     data:
       - data/bitcoin:/data
   - name: database
     restart: unless-stopped
-    image: postgres:12-alpine
+    image: ghcr.io/runcitadel/postgres:main@sha256:8f25afe966a63fd3f11a1052e73f30b9de5ddc0876bebaaf944d485374c73c01
     environment:
       POSTGRES_DB: bitcart
       POSTGRES_HOST_AUTH_METHOD: trust
     data:
       - data/postgres:/var/lib/postgresql/data
+    user: 1000:1000
   - name: redis
     restart: unless-stopped
     image: redis:alpine
@@ -70,28 +82,35 @@ containers:
     image: bitcartcc/bitcart-store:stable
     command: yarn start
     environment:
-      BITCART_STORE_API_URL: http://$APP_BITCARTCC_BACKEND_IP:8000
+      BITCART_STORE_API_URL: http://$APP_DOMAIN:$APP_BITCARTCC_MAIN_PORT/api
+      BITCART_STORE_SOCKS_PROXY: socks5h://$TOR_PROXY_IP:$TOR_PROXY_PORT
+      BITCART_STORE_ONION_API_URL: http://$APP_HIDDEN_SERVICE/api
+      BITCART_STORE_ONION_HOST: http://$APP_HIDDEN_SERVICE
+    user: 1000:1000
   - name: worker
     depends_on:
       - backend
     restart: unless-stopped
     image: bitcartcc/bitcart:stable
-    entrypoint: /usr/local/bin/docker-entrypoint.sh
     command: python3 worker.py
     environment:
       IN_DOCKER: false
       LOG_FILE: bitcart.log
       BITCART_DATADIR: /datadir
+      BITCART_BACKUPS_DIR: /backups
+      BITCART_VOLUMES: /datadir /backups
       BTC_NETWORK: $BITCOIN_NETWORK
       BTC_LIGHTNING: true
       REDIS_HOST: redis://$APP_BITCARTCC_REDIS_IP
       DB_HOST: $APP_BITCARTCC_DATABASE_IP
-    user: 1000:1000
+      BTC_HOST: $APP_BITCARTCC_BITCOIN_IP
     data:
       - data/bitcart:/datadir
+      - data/backups:/backups
   - image: nginx:1.21.3-alpine@sha256:1ff1364a1c4332341fc0a854820f1d50e90e11bb0b93eb53b47dc5e10c680116
     init: true
     port: 80
     name: main
     data:
       - nginx/nginx.conf:/etc/nginx/nginx.conf
+      - nginx/html:/usr/share/nginx/html/help

apps/bitcartcc/nginx/html/index.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>BitcartCC</title>
+    <link rel="stylesheet" type="text/css" href="pico.min.css" />
+</head>
+
+<body>
+    <main class="container container-fluid">
+        <h1>Welcome to BitcartCC!</h1>
+        <ul>
+            <li><a href="/">Access your store</a></li>
+            <li><a href="/admin">Access your admin panel</a></li>
+            <li><a href="/api/">Merchants API</a></li>
+            <li>
+                <a target="_blank" rel="noopener noreferrer"
+                    href="https://docs.bitcartcc.com/bitcartcc-basics/walkthrough">BitcartCC Walkthrough</a>
+            </li>
+        </ul>
+    </main>
+</body>
+
+</html>

apps/bitcartcc/nginx/nginx.conf

@@ -19,6 +19,24 @@ http {
 
 	default_type application/octet-stream;
 
+	# If we receive Upgrade, set Connection to "upgrade"; otherwise, delete any
+	# Connection header that may have been passed to this server
+	map $http_upgrade $proxy_connection {
+	default upgrade;
+	'' close;
+	}
+	# Apply fix for very long server names
+	server_names_hash_bucket_size 128;
+	# Prevent Nginx Information Disclosure
+	server_tokens off;
+	gzip on;
+	gzip_min_length 1000;
+	gzip_types image/svg+xml text/plain text/css application/javascript application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+
+	proxy_set_header Host $http_host;
+	proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection $proxy_connection;
+
 	server {
 		listen 80;
 
@@ -30,11 +48,14 @@ http {
             proxy_pass http://admin:4000;
         }
 
+		location /help {
+        	include  /etc/nginx/mime.types;
+        	root /usr/share/nginx/html;
+        	index index.html;
+    	}
+
 		location / {
-			proxy_pass http://store:3000/;
+			proxy_pass http://store:3000;
-			proxy_http_version 1.1;
-			proxy_set_header Upgrade $http_upgrade;
-			proxy_set_header Connection "upgrade";
 		}
 	}
 }