CI: Organized CI file

.gitlab-ci.yml

@@ -39,20 +39,21 @@ package server:
   <<:                     *maven_package
   stage:                  package
 
-.docker_image_template:   &docker_image
-  image:                  docker:${DOCKER_VERSION}
+
+.docker_setup: &docker_setup
   before_script:
-    # Configuration
-    - echo Building docker image ${CI_REGISTRY_IMAGE} on ${DOCKER_HOST}
-    - echo Registry ${CI_REGISTRY} user=${CI_REGISTRY_USER} ${CI_REGISTRY_PASSWORD}
     - TLS_PATH=~/.docker/${DOCKER_HOST}/certs && mkdir -p ${TLS_PATH}
     - echo "${DOCKER_TLS_CA}" > ${TLS_PATH}/ca.pem
     - echo "${DOCKER_TLS_KEY}" > ${TLS_PATH}/key.pem
     - echo "${DOCKER_TLS_CERT}" > ${TLS_PATH}/cert.pem
     - export DOCKER_CERT_PATH=${TLS_PATH}
     - DOCKER_CMD="docker --tlsverify=false"
+
+.docker_image_template:   &docker_image
+  <<:                     *docker_setup
   script:
     # Actions
+    - echo Building docker image ${CI_REGISTRY_IMAGE} on ${DOCKER_HOST}
     - cp target/*.war docker
     - cd docker
     - if [ "${CI_COMMIT_REF_SLUG}" = "${CI_DEFAULT_BRANCH}" ] ; then
@@ -82,16 +83,6 @@ dockerize server:
       when: manual
       allow_failure: true
 
-.docker_setup: &docker_setup
-  before_script:
-    - echo Tagging latest image ${CI_REGISTRY_IMAGE}:{VERSION}
-    - TLS_PATH=~/.docker/${DOCKER_HOST}/certs && mkdir -p ${TLS_PATH}
-    - echo "${DOCKER_TLS_CA}" > ${TLS_PATH}/ca.pem
-    - echo "${DOCKER_TLS_KEY}" > ${TLS_PATH}/key.pem
-    - echo "${DOCKER_TLS_CERT}" > ${TLS_PATH}/cert.pem
-    - export DOCKER_CERT_PATH=${TLS_PATH}
-    - DOCKER_CMD="docker --tlsverify=false"
-
 tag latest image:
   stage:                  tag
   image:                  docker:${DOCKER_VERSION}