CI Includes get evaluated first, so DISTRO var doesnt work

.gitlab-ci.yml

@@ -14,36 +14,6 @@ before_script:
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 - env|sort
 
-x86_64:build:
+include:
-  variables:
+  - .gitlab-docker-x86_64.yml
-    VERSION: x86_64
+  - .gitlab-docker-armv7l.yml
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || 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
-  - x86_64
-  only:
-  - master
-
-armv7l:build:
-  variables:
-    VERSION: armv7l
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || 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-armv7l.yml

@@ -0,0 +1,16 @@
+armv7l:build:
+  variables:
+    VERSION: armv7l-stretch
+  stage: build
+  image: docker:latest
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || 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:
+  - stretch

.gitlab-docker-x86_64.yml

@@ -0,0 +1,16 @@
+x86_64:build:
+  variables:
+    VERSION: x86_64-stretch
+  stage: build
+  image: docker:latest
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || 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
+  - x86_64
+  only:
+  - stretch