Consilidate gitlab-ci files

.gitlab-ci.yml

@@ -15,7 +15,5 @@ before_script:
 - docker info
 - docker version
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-- ls -alR .
 
-include: .gitlab-docker-x86_64.yml
-#include: .gitlab-docker-armv7l.yml
+include: .gitlab-docker.yml

.gitlab-docker-armv7l.yml

@@ -1,16 +0,0 @@
-armv7l:build:
-  variables:
-    ARCH: armv7l
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
-  tags:
-  - docker
-  - armv7l
-  only:
-  - master

.gitlab-docker.yml

@@ -11,7 +11,6 @@ x86_64:build:
   - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
   - docker
-  - x86_64
+  - ${ARCH}
   only:
-  - master
-
+  - ${ARCH}