introduce armv6 build + fix for mp4f bin + add release to heartbeat

.github/workflows/docker-dev.yml

@@ -1,4 +1,4 @@
-name: Docker Development build
+name: Docker development build
 
 on:
   push:
@@ -35,7 +35,6 @@ jobs:
     strategy:
       matrix:
         architecture: [arm64, arm/v7, arm/v6]
-        #architecture: [arm64, arm/v7]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2

.github/workflows/docker-nightly.yml

@@ -1,4 +1,4 @@
-name: Docker Nightly build
+name: Docker nightly build
 
 on:
   # Triggers the workflow every day at 9PM (CET).
@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [arm64, arm/v7]
+        architecture: [arm64, arm/v7, arm/v6]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Docker Production build
+name: Docker master build
 
 on:
   push:
@@ -61,7 +61,7 @@ jobs:
     needs: build-amd64
     strategy:
       matrix:
-        architecture: [arm64, arm-v7]
+        architecture: [arm64, arm-v7, arm-v6]
     steps:
     - name: Login to DockerHub
       uses: docker/login-action@v2
@@ -81,7 +81,7 @@ jobs:
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Run Buildx
-      run: docker buildx build --platform linux/$(echo ${{matrix.architecture}} | tr - /) -t $REP-arch:arch-${{matrix.architecture}}-${{steps.short-sha.outputs.sha}} --push . 
+      run: docker buildx build --platform linux/$(echo ${{matrix.architecture}} | tr - /) -t $REPO-arch:arch-${{matrix.architecture}}-${{steps.short-sha.outputs.sha}} --push . 
     - name: Create new and append to manifest
       run: docker buildx imagetools create --append -t $REPO:${{ steps.short-sha.outputs.sha }} $REPO-arch:arch-${{matrix.architecture}}-${{steps.short-sha.outputs.sha}}
     - name: Create new and append to manifest latest

Dockerfile

@@ -107,6 +107,7 @@ RUN apk update && apk add ca-certificates curl libstdc++ libc6-compat --no-cache
 # Try running agent
 
 RUN mv /agent/* /home/agent/
+RUN cp /home/agent/mp4fragment /usr/local/bin/
 RUN /home/agent/main version
 
 #######################

machinery/main.go

@@ -14,6 +14,8 @@ import (
 	"gopkg.in/DataDog/dd-trace-go.v1/profiler"
 )
 
+var VERSION = "3.0.0"
+
 func main() {
 
 	// You might be interested in debugging the agent.
@@ -48,7 +50,6 @@ func main() {
 	}
 
 	// Start the show ;)
-	const VERSION = "3.0"
 	action := os.Args[1]
 
 	timezone, _ := time.LoadLocation("CET")

machinery/src/cloud/Cloud.go

@@ -224,7 +224,8 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
 
 			var object = fmt.Sprintf(`{
 				"key" : "%s",
-				"version" : "%s",
+				"version" : "3.0.0",
+				"release" : "%s",
 				"cpuid" : "%s",
 				"clouduser" : "%s",
 				"cloudpublickey" : "%s",
@@ -252,8 +253,6 @@ func HandleHeartBeat(configuration *models.Configuration, communication *models.
 				"raspberrypi" : false
 			}`, config.Key, system.Version, system.CPUId, username, key, name, isEnterprise, system.Hostname, system.Architecture, system.TotalMemory, system.UsedMemory, system.FreeMemory, system.MACs, system.IPs, "0", "0", "0", uptimeString, config.HubSite, onvifEnabled)
 
-			fmt.Println(object)
-
 			var jsonStr = []byte(object)
 			buffy := bytes.NewBuffer(jsonStr)
 			req, _ := http.NewRequest("POST", url, buffy)
@@ -486,7 +485,6 @@ func VerifyPersistence(c *gin.Context) {
 
 		if config.Cloud == "s3" {
 
-			//fmt.Println("Uploading...")
 			// timestamp_microseconds_instanceName_regionCoordinates_numberOfChanges_token
 			// 1564859471_6-474162_oprit_577-283-727-375_1153_27.mp4
 			// - Timestamp

machinery/src/models/System.go

@@ -4,6 +4,7 @@ type System struct {
 	CPUId         string   `json:"cpu_idle" bson:"cpu_idle"`
 	Hostname      string   `json:"hostname" bson:"hostname"`
 	Version       string   `json:"version" bson:"version"`
+	Release       string   `json:"release" bson:"release"`
 	BootTime      uint64   `json:"boot_time" bson:"boot_time"`
 	KernelVersion string   `json:"kernel_version" bson:"kernel_version"`
 	MACs          []string `json:"macs" bson:"macs"`

machinery/src/utils/main.go

@@ -253,7 +253,7 @@ func CreateFragmentedMP4(fullName string, fragmentedDuration int64) {
 	path, _ := os.Getwd()
 	duration := fragmentedDuration * 1000
 	// This timescale is crucial, as it should be the same as the one defined in JOY4.
-	cmd := exec.Command("/agent/mp4fragment", "--timescale", "10000", "--fragment-duration", strconv.FormatInt(duration, 10), fullName, fullName+"f.mp4")
+	cmd := exec.Command("mp4fragment", "--timescale", "10000", "--fragment-duration", strconv.FormatInt(duration, 10), fullName, fullName+"f.mp4")
 	cmd.Dir = path
 	log.Log.Info(cmd.String())
 	var out bytes.Buffer