circleci

5 years ago · 80eeda4f44
parent 62eee2858f
commit 80eeda4f44
1 changed files with 0 additions and 4 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -26,11 +26,7 @@ jobs:
            sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
            LATEST_TAG="${CIRCLE_TAG:1}"
            DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG-arm32v7"
-<<<<<<< HEAD
            DOCKERHUB_DOCKERFILE="Dockerfile.arm32v7"
-=======
-            DOCKERHUB_DOCKERFILE="Dockerfile"
->>>>>>> upstream/master
            sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
            sudo docker build --pull -t "$DOCKERHUB_DESTINATION" -f "$DOCKERHUB_DOCKERFILE" .
            sudo docker push "$DOCKERHUB_DESTINATION"