Merge ee46b5b7d0 into b11034dd17

.github/workflows/go.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v4
       with:
         go-version: '1.20.2'
     - name: Check out code

CHANGELOG.md

@@ -1,23 +0,0 @@
-# Changelog
-
-## [1.3.2] - 08-12-2024
-
-* Fix to Browser Dev feature:
-    * Checking browser dev url when internet_accessible was checking the incorrect path. This is now fixed.
-
-## [1.3.1] - 08-12-2024
-
-* Fixes to Browser Dev feature:
-    * Now edgeboxctl also fetches or generates the browser dev environment url and saves it into an option both when starting, and every time the browser dev status is fetched.
-
-## [1.3.0] - 05-12-2024
-
-* Added Edgebox Browser Development Environment Feature Support
-    * Added tasks for handling browser development environment into tasks.go
-    * Added executable tasks to ExecuteTask and scheduled ones to ExecuteSchedules
-* Other bug fixes and improvements.
-
-### Missing Past Releases
-
-Release notes for past versions are not available in this file. Please refer to the [GitHub releases](https://hithub.com/edgebox-iot/edgeboxctl/releases) for more information. Feel free to contribute to this file by adding missing release notes.
-

Makefile

@@ -67,7 +67,7 @@ run:
 install:
 	@echo "📦 Installing edgeboxctl service (${RELEASE}) for ${GOOS} (${GOARCH})\n"
 	
-	@echo "�🚧 Stopping edgeboxctl service if it is running"
+	@echo "🚧 Stopping edgeboxctl service if it is running"
 	sudo systemctl stop edgeboxctl || true
 
 	@echo "\n🗑️ Removing old edgeboxctl binary and service"

README.md

@@ -59,12 +59,10 @@ To get a local copy up and running follow these simple steps.
 If you're running for development purposes, a docker container suffices, so make sure you have:
 
 * docker
-* docker compose (docker-compose-v2 package)
+* docker compose
 
 Check the following links for more info on [Docker](https://www.docker.com/) and [Docker Compose](https://docs.docker.com/compose/).
 
-**Note:** If you don't have `docker compose` available, install it with: `sudo apt-get install docker-compose-v2`
-
 Aditionally, `edgeboxctl` needs the following bash commands available wherever it runs:
 
 * `arm-linux-gnueabi-gcc` (`sudo apt-get install gcc-arm*`)
@@ -81,10 +79,10 @@ Aditionally, `edgeboxctl` needs the following bash commands available wherever i
 ```sh
 git clone https://github.com/edgebox-iot/edgeboxctl.git
 ```
-2. Run Docker Compose
-
+2. Run Docker-Compose
+```sh
+docker-compose up
 ```
-docker compose up
 
 
 

internal/edgeapps/edgeapps.go

@@ -489,7 +489,7 @@ func GetEdgeAppServices(ID string) []EdgeAppService {
 		// Check if the service is actually running
 		if shouldBeRunning {
 			cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "exec", "-T", serviceID, "echo", "'Service Check'"}
-			cmdResult := utils.Exec(wsPath, "docker", append([]string{"compose"}, cmdArgs...))
+			cmdResult := utils.Exec(wsPath, "docker-compose", cmdArgs)
 			if cmdResult != "" {
 				isRunning = true
 			}
@@ -511,7 +511,7 @@ func RunEdgeApp(ID string) EdgeAppStatus {
 	for _, service := range services {
 
 		cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "start", service.ID}
-		utils.Exec(wsPath, "docker", append([]string{"compose"}, cmdArgs...))
+		utils.Exec(wsPath, "docker-compose", cmdArgs)
 	}
 
 	// Wait for it to settle up before continuing...
@@ -529,7 +529,7 @@ func StopEdgeApp(ID string) EdgeAppStatus {
 	for _, service := range services {
 
 		cmdArgs = []string{"-f", wsPath + "/docker-compose.yml", "stop", service.ID}
-		utils.Exec(wsPath, "docker", append([]string{"compose"}, cmdArgs...))
+		utils.Exec(wsPath, "docker-compose", cmdArgs)
 	}
 
 	// Wait for it to settle up before continuing...

internal/tasks/tasks.go

@@ -18,8 +18,6 @@ import (
 	"github.com/edgebox-iot/edgeboxctl/internal/system"
 	"github.com/edgebox-iot/edgeboxctl/internal/utils"
 
-	"github.com/joho/godotenv"
-
 	_ "github.com/go-sql-driver/mysql" // Mysql Driver
 	_ "github.com/mattn/go-sqlite3"    // SQlite Driver
 )
@@ -534,8 +532,6 @@ func ExecuteSchedules(tick int) {
 		taskGetBrowserDevPassword()
 		taskGetBrowserDevStatus()
 		
-		taskCheckSystemUpdates()
-		
 		ip := taskGetSystemIP()
 		log.Println("System IP is: " + ip)
 
@@ -565,6 +561,8 @@ func ExecuteSchedules(tick int) {
 		log.Println(taskGetEdgeApps())
 		taskUpdateSystemLoggerServices()
 		taskRecoverFromUpdate()
+		taskCheckSystemUpdates()
+		
 	}
 
 	if tick%5 == 0 {
@@ -573,10 +571,6 @@ func ExecuteSchedules(tick int) {
 		log.Println(taskGetStorageDevices())
 	}
 
-	if tick%15 == 0 {
-		taskGetBrowserDevStatus()
-	}
-
 	if tick%30 == 0 {
 		// Executing every 30 ticks
 		log.Println(taskGetEdgeApps())
@@ -1153,13 +1147,10 @@ func taskGetBrowserDevStatus() string {
 		"sh",
 		[]string{"-c", "systemctl --quiet is-active code-server@root && echo 'active' || echo 'inactive'"},
 	)	
-	if browserDevStatus == "active" {
+	if browserDevStatus != "" {
 		fmt.Println("Browser Dev Environment is running")
 		utils.WriteOption("BROWSERDEV_STATUS", "running")
-		taskGetBrowserDevUrl()
-
 		return "{\"status\": \"running\"}"
-
 	} else {
 		fmt.Println("Browser Dev Environment is not running")
 		utils.WriteOption("BROWSERDEV_STATUS", "not_running")
@@ -1167,24 +1158,6 @@ func taskGetBrowserDevStatus() string {
 	}
 }
 
-func taskGetBrowserDevUrl() string {
-	url := ""
-	myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.BrowserDevPath) + "myedgeapp.env")
-	if err != nil {
-		log.Println("No myedge.app environment file found. Status is Network-Only")
-		url = "http://dev." + system.GetHostname() + ".local"
-	} else {
-		if myEdgeAppServiceEnv["INTERNET_URL"] != "" {
-			url = "https://" + myEdgeAppServiceEnv["INTERNET_URL"]
-		}
-	}
-
-	fmt.Println("Browser Dev Url: " + url)
-
-	utils.WriteOption("BROWSERDEV_URL", url)
-	return url
-}
-
 func taskActivateBrowserDev() string {
 	fmt.Println("Executing taskActivateBrowserDev")
 	wsPath := utils.GetPath(utils.WsPath)
@@ -1197,10 +1170,6 @@ func taskActivateBrowserDev() string {
 	system.StartWs()
 	// Write control option for API
 	utils.WriteOption("BROWSERDEV_STATUS", "running")
-
-	// Write and refresh the dev environment password option
-	taskGetBrowserDevPassword()
-
 	return "{\"status\": \"ok\"}"
 }
 
@@ -1220,14 +1189,15 @@ func taskDeactivateBrowserDev() string {
 
 func taskGetBrowserDevPassword() string {
 	fmt.Println("Executing taskGetBrowserDevPassword")
-
+	password := utils.ReadOption("BROWSERDEV_PASSWORD")
+	if password == "" {
 		password, err := system.FetchBrowserDevPasswordFromFile()
 		if err == nil {
 			utils.WriteOption("BROWSERDEV_PASSWORD", password)
 		} else {
 			fmt.Println("Error fetching browser dev password from file: " + err.Error())
 		}
-
+	}
 	return password
 }
 

internal/utils/utils.go

@@ -54,7 +54,7 @@ func Exec(path string, command string, args []string) string {
 		// log.Println(fmt.Sprint(err) + ": " + stderr.String()) // ... Silence...
 	}
 
-	// log.Println("Result: " + out.String()) // ... Silence ...
+	log.Println("Result: " + out.String()) // ... Silence ...
 
 	return strings.Trim(out.String(), " \n")
 
@@ -111,7 +111,6 @@ const ApiPath string = "apiPath"
 const EdgeAppsPath string = "edgeAppsPath"
 const EdgeAppsBackupPath string = "edgeAppsBackupPath"
 const WsPath string = "wsPath"
-const BrowserDevPath string = "browserDevPath"
 const LoggerPath string = "loggerPath"
 const BrowserDevPasswordFileLocation string = "browserDevPasswordFileLocation"
 const BrowserDevProxyPath string = "browserDevProxyPath"
@@ -177,14 +176,6 @@ func GetPath(pathKey string) string {
 			targetPath = "/home/system/components/ws/"
 		}
 
-	case BrowserDevPath:
-
-		if env["BROWSERDEV_PATH"] != "" {
-			targetPath = env["BROWSERDEV_PATH"]
-		} else {
-			targetPath = "/home/system/components/dev/"
-		}
-
 	case LoggerPath:
 		if env["LOGGER_PATH"] != "" {
 			targetPath = env["LOGGER_PATH"]