build docker for armv6

.circleci/config.yml

@@ -102,6 +102,23 @@ jobs:
             docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             docker build --pull -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v7 -f Dockerfile.rpi .
             docker push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v7
+
+  # -------------------------------------
+  # publish docker arm
+  # -------------------------------------
+  publish_docker_linuxarm32v6:
+    machine:
+      docker_layer_caching: true
+    steps:
+      - checkout  
+      - run: git submodule update --init
+      - run:
+          command: |
+            export TAG=${CIRCLE_TAG:-latest}
+            docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
+            docker build --build-arg ARCH=armv6l --pull -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v6 -f Dockerfile.rpi . 
+            docker push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v6
+
   # -------------------------------------
   # publish docker manifest
   # -------------------------------------
@@ -116,9 +133,10 @@ jobs:
             #
             docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             export TAG=${CIRCLE_TAG:-lastest}
-            docker manifest create --amend $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG} $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-amd64 $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v7
+            docker manifest create --amend $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG} $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-amd64 $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v7  $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v6
             docker manifest annotate $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG} $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-amd64 --os linux --arch amd64
             docker manifest annotate $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG} $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v7 --os linux --arch arm --variant v7
+            docker manifest annotate $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG} $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG}-arm32v6 --os linux --arch arm --variant v6
             docker manifest push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:${TAG} -p
 
 
@@ -167,10 +185,15 @@ workflows:
           filters:
             tags:
               only: /.*/            
+      - publish_docker_linuxarm32v6:
+          filters:
+            tags:
+              only: /.*/            
       - publish_docker_multiarch:
           requires:
             - publish_docker_linuxamd64
             - publish_docker_linuxarm32v7
+            - publish_docker_linuxarm32v6
           filters:
             tags:
               only: /.*/        

.cirrus.yml

@@ -3,3 +3,6 @@ linux_docker_builder:
 
 rpi_docker_builder:
   script: docker build -t $CIRRUS_REPO_FULL_NAME:cirrus-rpi . -f Dockerfile.rpi
+
+linuxarmv6_docker_builder:    
+  script: docker build -t $CIRRUS_REPO_FULL_NAME:cirrus-armv6 . -f Dockerfile.rpi --build-arg ARCH=armv6l

Dockerfile.rpi

@@ -3,11 +3,14 @@ LABEL maintainer michel.promonet@free.fr
 WORKDIR /v4l2rtspserver
 COPY . /v4l2rtspserver
 
+ARG ARCH=armv7l
+
 RUN apt-get update \
-        && apt-get install -y --no-install-recommends ca-certificates g++ autoconf automake libtool xz-utils cmake make liblog4cpp5-dev pkg-config git wget \
+        && apt-get install -y --no-install-recommends ca-certificates g++ autoconf automake libtool xz-utils cmake make pkg-config git wget \
         && wget -qO- https://releases.linaro.org/components/toolchain/binaries/6.4-2018.05/arm-linux-gnueabihf/gcc-linaro-6.4.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz  | tar xJ \
 	&& export PATH=$(pwd)/gcc-linaro-6.4.1-2018.05-x86_64_arm-linux-gnueabihf/bin:$PATH \
-        && cmake -DCMAKE_TOOLCHAIN_FILE=raspberry.toolchain . && make install \
+        && cmake -DCMAKE_SYSTEM_PROCESSOR=${ARCH} -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY . \
+	&& make install \
 	&& apt-get clean && rm -rf /var/lib/apt/lists/
 
 

inc/HTTPServer.h

@@ -65,6 +65,9 @@ class HTTPServer : public RTSPServer
 		HTTPServer(UsageEnvironment& env, int ourSocket, Port rtspPort, UserAuthenticationDatabase* authDatabase, unsigned reclamationTestSeconds, unsigned int hlsSegment, const std::string & webroot)
 		  : RTSPServer(env, ourSocket, rtspPort, authDatabase, reclamationTestSeconds), m_hlsSegment(hlsSegment), m_webroot(webroot)
 		{
+			if ( (!m_webroot.empty()) && (*m_webroot.rend() != '/') ) {
+				m_webroot += "/";
+			}
 		}
 
 		RTSPServer::RTSPClientConnection* createNewClientConnection(int clientSocket, struct sockaddr_in clientAddr) 

index.html

@@ -17,13 +17,6 @@
 			document.write("HLS not supported");
 		}
 	</script>
-	<h3>MPEG-DASH</h3>
-	<video controls id="dashvideo"></video>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/dashjs/2.5.0/dash.all.min.js" ></script>
-	<script>
-		var player = new dashjs.MediaPlayer().create();
-		player.initialize(document.getElementById("dashvideo"),streamList[0]+".mpd",true);
-	</script>
     </body>
 </html>