build then retag rathen than building twice

.gitlab-ci.yml

@@ -7,7 +7,6 @@
   project: xcg/ci-templates
 
 variables:
-  TAG_LATEST: branch/default
   HTML_DOC_SOURCES: doc/_build/html
 
 import_jsonrpc_odoo11_test:
@@ -65,5 +64,7 @@
   allow_failure: true
 
 build-docker-image:
+  variables:
+    TAG_LATEST: branch/default
   script:
   - DOCKER_IMAGE=registry.xcg.io/xcgd/odoo_scripts docker-build
@@ -68,6 +69,6 @@
   script:
   - DOCKER_IMAGE=registry.xcg.io/xcgd/odoo_scripts docker-build
-  - DOCKER_IMAGE=xcgd/odoo_scripts docker-build
+  - DOCKER_BASE_IMAGE_NAME=registry.xcg.io/xcgd/odoo_scripts DOCKER_IMAGE=xcgd/odoo_scripts docker-tag
 
 build-documentation:
   stage: build