Cache our builds based on branches - part 2

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 variables:
   BRANCH: plus
   VERSION: 7.1-fpm-${BRANCH}
-  CACHETAG: build
+  CACHETAG: build-${BRANCH}
   DOCKER_REGISTRY: registry.leenooks.net
   DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
 
@@ -35,7 +35,7 @@ build:
   - 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}-${BRANCH}
+  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
   - docker
   only: