Update .gitlab-ci.yml

Signed-off-by: solidnerd <niclas@mietz.io>

Author: solidnerd

.gitlab-ci.yml

@@ -1,39 +1,25 @@
-image: docker:1.11.2
-
 stages:
 - build
 - test
-- prerelease
-- release
-
-before_script:
-  - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-
+- image
 build:
   stage: build
+  before_script:
+    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
   script:
     - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME .
-
-prerelease:
-  stage: prerelease
-  script:
     - docker push $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
     - docker rmi $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
 
-release-version:
-  stage: release
+release:
+  stage: image
+  before_script:
+    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
   script:
     - docker pull $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME
     - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME $CI_REGISTRY_IMAGE:$(cat VERSION)
     - docker push $CI_REGISTRY_IMAGE:$(cat VERSION)
     - docker rmi $CI_REGISTRY_IMAGE:$(cat VERSION)
-  only:
-    - master
-
-release-latest:
-  stage: release
-  script:
-    - docker pull $CI_REGISTRY_IMAGE:CI_BUILD_REF_NAME
     - docker tag $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME $CI_REGISTRY_IMAGE:latest
     - docker push $CI_REGISTRY_IMAGE:latest
     - docker rmi $CI_REGISTRY_IMAGE:latest