Revert "Revert to using old dockerfiles"

This reverts commit 02a2716.

.circleci/config.yml

@@ -23,8 +23,9 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:8} #trim "basedon-" from tag
             # Make sure the builder is copy the arm emulator
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
+            sed -i -e 's/#EnableQEMU //g' "contrib/docker/Dockerfile.arm32v7"
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f contrib/docker/linuxarm32v7.Dockerfile .
+            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm32v7 -f contrib/docker/Dockerfile.arm32v7 .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm32v7
   arm64v8:
@@ -37,8 +38,9 @@ jobs:
             LATEST_TAG=${CIRCLE_TAG:8} #trim "basedon-" from tag
             # Make sure the builder is copy the arm emulator
             sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
+            sed -i -e 's/#EnableQEMU //g' "contrib/docker/Dockerfile.arm64v8"
             #
-            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f contrib/docker/linuxarm64v8.Dockerfile .
+            sudo docker build --pull -t $DOCKERHUB_REPO:$LATEST_TAG-arm64v8 -f contrib/docker/Dockerfile.arm64v8 .
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker push $DOCKERHUB_REPO:$LATEST_TAG-arm64v8
   publish_docker_dev:

.dockerignore

@@ -1,5 +1,3 @@
 Dockerfile
 contrib/docker/Dockerfile.*
-contrib/docker/linuxarm32v7.Dockerfile
-contrib/docker/linuxarm64v8.Dockerfile
 .circleci/config.yml