.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,10 +1,5 @@
 # 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:

Makefile

@@ -67,7 +67,7 @@ run:
 install:
 	@echo "📦 Installing edgeboxctl service (${RELEASE}) for ${GOOS} (${GOARCH})\n"
 	
-	@echo "<EFBFBD>🚧 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

@@ -1169,7 +1169,7 @@ func taskGetBrowserDevStatus() string {
 
 func taskGetBrowserDevUrl() string {
 	url := ""
-	myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.BrowserDevPath) + "myedgeapp.env")
+	myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath(utils.EdgeAppsPath) + "dev/myedgeapp.env")
 	if err != nil {
 		log.Println("No myedge.app environment file found. Status is Network-Only")
 		url = "http://dev." + system.GetHostname() + ".local"

internal/utils/utils.go

@@ -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"]