From 0d4f7a80c0080a0fbc132d87d2e10ee82c6727f9 Mon Sep 17 00:00:00 2001
From: Helder Betiol <37706737+helderbetiol@users.noreply.github.com>
Date: Tue, 19 Dec 2023 15:37:21 +0100
Subject: [PATCH] Fix APP bugs: launch.sh on Mac and tenant docker status
 (#334)

* fix(deploy) app launch for mac

* fix(deploy) default por for back

* fix(app) docker status for tenant
---
 APP/lib/common/api_backend.dart |  2 +-
 deploy/app/launch.sh            | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/APP/lib/common/api_backend.dart b/APP/lib/common/api_backend.dart
index 1eec80325..6c31358f8 100644
--- a/APP/lib/common/api_backend.dart
+++ b/APP/lib/common/api_backend.dart
@@ -592,7 +592,7 @@ Future<Result<List<DockerContainer>, Exception>> fetchTenantDockerInfo(
   print("API get Tenant Docker Info");
   client ??= http.Client();
   try {
-    Uri url = Uri.parse('$apiUrl/api/tenants/${tenantName.toLowerCase()}');
+    Uri url = Uri.parse('$apiUrl/api/tenants/${tenantName}');
     final response = await client.get(url, headers: getHeader(token));
     print(response.statusCode);
     if (response.statusCode == 200) {
diff --git a/deploy/app/launch.sh b/deploy/app/launch.sh
index e069be12e..367648e1b 100755
--- a/deploy/app/launch.sh
+++ b/deploy/app/launch.sh
@@ -1,14 +1,16 @@
 #!/bin/bash
 
 portWeb=8080
-portBack=8082
+portBack=8081
 forceStop=false
-while getopts w:b:f flag
+isMac=false
+while getopts w:b:fm flag
 do
     case "$flag" in
         w) portWeb=${OPTARG};;
         b) portBack=${OPTARG};;
         f) forceStop=true;;
+        m) isMac=true;;
     esac
 done
 
@@ -39,5 +41,10 @@ docker run --restart always --name $containername -p $portWeb:80 -v $assetsDir:/
 
 # compile and run back
 cd ../BACK/docker-backend
-docker run --rm -v $(pwd):/workdir -w /workdir golang go build -o ogree_app_backend
+if $isMac; then
+    echo "Compiling backend for macOS"
+    docker run --rm -v $(pwd):/workdir -w /workdir -e GOOS=darwin golang go build -o ogree_app_backend
+else
+    docker run --rm -v $(pwd):/workdir -w /workdir -e GOOS=linux golang go build -o ogree_app_backend
+fi
 ./ogree_app_backend -port $portBack