fixed ci

.gitlab-ci.yml

@@ -102,66 +102,68 @@ npm_publish:
   only:
   - /^release\/.*/
 
-docker_publish_production:
+docker_publish_alpha:
   stage: publish
   image: ubleipzig/deployer:1.0.0
   services:
   - docker:dind
   script: |
-    version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'`
     deployer publish \
-      --input image.tar.gz
-      --docker-config "$DOCKER_AUTH_CONFIG" \
+      --input image.tar.gz \
+      --docker-config "${DOCKER_AUTH_CONFIG}" \
       --name ${image_name} \
-      --tag latest \
-      --tag ${version} \
-      --tag $(expr ${version} ':' '\([^.]\+\)') \
-      --tag $(expr ${version} ':' '[^.]\+\.\([^.]\+\)') \
-      --tag $(expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\))`
+      --tag ${CI_COMMIT_REF_NAME}
   dependencies:
   - docker_build
   tags:
-    - docker
-  except:
-  - branches
+  - docker
   only:
-  - /^release\/.*/
+  - branches
+  except:
+  - master
 
-docker_publish_alpha:
+docker_publish_staging:
   stage: publish
   image: ubleipzig/deployer:1.0.0
   services:
   - docker:dind
   script: |
     deployer publish \
+      --input image.tar.gz \
       --docker-config "$DOCKER_AUTH_CONFIG" \
       --name ${image_name} \
-      --tag ${CI_COMMIT_REF_NAME}
+      --tag staging
   dependencies:
   - docker_build
   tags:
-  - docker
+    - docker
   only:
-  - branches
-  except:
   - master
 
-docker_publish_staging:
+docker_publish_production:
   stage: publish
   image: ubleipzig/deployer:1.0.0
   services:
   - docker:dind
   script: |
+    version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'`
     deployer publish \
+      --input image.tar.gz
       --docker-config "$DOCKER_AUTH_CONFIG" \
       --name ${image_name} \
-      --tag staging
+      --tag latest \
+      --tag ${version} \
+      --tag $(expr ${version} ':' '\([^.]\+\)') \
+      --tag $(expr ${version} ':' '[^.]\+\.\([^.]\+\)') \
+      --tag $(expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\))`
   dependencies:
   - docker_build
   tags:
     - docker
+  except:
+  - branches
   only:
-  - master
+  - /^release\/.*/
 
 deploy_alpha:
   stage: deploy