From 00f87dc91beffc01f759485a120c203cf326e99d Mon Sep 17 00:00:00 2001
From: DrMxrcy <58747968+DrMxrcy@users.noreply.github.com>
Date: Thu, 8 Feb 2024 02:06:42 -0500
Subject: [PATCH] Update Peppermint (#1813)

* Update Peppermint

* Update Peppermint

* Update ports
---
 apps/peppermint/config.json        | 13 ++++++++++---
 apps/peppermint/docker-compose.yml | 31 ++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/apps/peppermint/config.json b/apps/peppermint/config.json
index bae160e5..d7a82612 100644
--- a/apps/peppermint/config.json
+++ b/apps/peppermint/config.json
@@ -1,11 +1,11 @@
 {
   "$schema": "../schema.json",
   "name": "Peppermint",
-  "port": 8176,
+  "port": 8216,
   "available": true,
   "exposable": true,
   "id": "peppermint",
-  "tipi_version": 3,
+  "tipi_version": 5,
   "version": "latest",
   "categories": [
     "utilities"
@@ -20,7 +20,14 @@
       "label": "Peppermint DB Password",
       "min": 32,
       "env_variable": "PEPPERMINT_DB_PASSWORD"
+    },
+    {
+      "type": "text",
+      "label": "API URL",
+      "required": true,
+      "hint": "Can be an exposable domiain like peppermintapi.example.com or peppermintapi.tipi.local",
+      "env_variable": "PEPPERMINT_DOMAIN_API"
     }
   ],
-  "supported_architectures": ["amd64"]
+  "supported_architectures": ["amd64", "arm64"]
 }
diff --git a/apps/peppermint/docker-compose.yml b/apps/peppermint/docker-compose.yml
index 2e603a2c..3249bb83 100644
--- a/apps/peppermint/docker-compose.yml
+++ b/apps/peppermint/docker-compose.yml
@@ -5,14 +5,14 @@ services:
     image: pepperlabs/peppermint:latest
     container_name: peppermint
     environment:
-      - PORT=5000
       - DB_USERNAME=tipi
       - DB_PASSWORD=${PEPPERMINT_DB_PASSWORD}
       - DB_HOST=peppermint-db
-      - BASE_URL=${APP_PROTOCOL:-http}://${APP_DOMAIN}
+      - API_URL={APP_PROTOCOL:-http}://${PEPPERMINT_DOMAIN_API}
     restart: unless-stopped
     ports:
-      - ${APP_PORT}:5000
+      - ${APP_PORT}:3000
+      - 8217:5003
     depends_on:
       - peppermint-db
     networks:
@@ -21,7 +21,7 @@ services:
       # Main
       traefik.enable: true
       traefik.http.middlewares.peppermint-web-redirect.redirectscheme.scheme: https
-      traefik.http.services.peppermint.loadbalancer.server.port: 5000
+      traefik.http.services.peppermint.loadbalancer.server.port: 3000
       # Web
       traefik.http.routers.peppermint-insecure.rule: Host(`${APP_DOMAIN}`)
       traefik.http.routers.peppermint-insecure.entrypoints: web
@@ -42,6 +42,29 @@ services:
       traefik.http.routers.peppermint-local.entrypoints: websecure
       traefik.http.routers.peppermint-local.service: peppermint
       traefik.http.routers.peppermint-local.tls: true
+      #API URL
+      traefik.http.middlewares.peppermint-api-web-redirect.redirectscheme.scheme: https
+      traefik.http.services.peppermint-api.loadbalancer.server.port: 5003
+      # Web
+      traefik.http.routers.peppermint-api-insecure.rule: Host(`${PEPPERMINT_DOMAIN_API}`)
+      traefik.http.routers.peppermint-api-insecure.entrypoints: web
+      traefik.http.routers.peppermint-api-insecure.service: peppermint
+      traefik.http.routers.ppeppermint-api-insecure.middlewares: peppermint-api-web-redirect
+      # Websecure
+      traefik.http.routers.peppermint-api.rule: Host(`${PEPPERMINT_DOMAIN_API}`)
+      traefik.http.routers.peppermint-api.entrypoints: websecure
+      traefik.http.routers.peppermint-api.service: peppermint
+      traefik.http.routers.peppermint-api.tls.certresolver: myresolver
+      # Local domain
+      traefik.http.routers.peppermint-api-local-insecure.rule: Host(`peppermintapi.${LOCAL_DOMAIN}`)
+      traefik.http.routers.peppermint-api-local-insecure.entrypoints: web
+      traefik.http.routers.peppermint-api-local-insecure.service: peppermint
+      traefik.http.routers.peppermint-api-local-insecure.middlewares: peppermint-api-web-redirect
+      # Local domain secure
+      traefik.http.routers.peppermint-api-local.rule: Host(`peppermintapi.${LOCAL_DOMAIN}`)
+      traefik.http.routers.peppermint-api-local.entrypoints: websecure
+      traefik.http.routers.peppermint-api-local.service: peppermint
+      traefik.http.routers.peppermint-api-local.tls: true
 
   peppermint-db:
     container_name: peppermint-db