make it a bit simpler, remove slug

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
   - deploy_to_test
   - deploy_to_production
 
-docker-build-master:
+docker-build:
   # Official docker image.
   image: docker:latest
   stage: build
@@ -15,9 +15,9 @@ docker-build-master:
   script:
     - docker build --pull -t "$CI_REGISTRY_IMAGE" atdb
     - docker push "$CI_REGISTRY_IMAGE"
-  only:
-    - master
-    - release
+#  only:
+#    - master
+#    - release
 
 docker-build-branch:
 # Official docker image.
@@ -28,8 +28,8 @@ docker-build-branch:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" atdb
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE" atdb
+    - docker push "$CI_REGISTRY_IMAGE"
   except:
     - master
     - release
@@ -86,7 +86,7 @@ docker-deploy-branch-to-test:
     - ssh-keyscan dop814.astron.nl >> ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-    - ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG""
+    - ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker pull "$CI_REGISTRY_IMAGE""
     - ssh -o StrictHostKeyChecking=no vermaas@dop814.astron.nl "docker-compose -p atdb -f /docker_compose/atdb-ldv/docker-compose-dev-cd.yml up -d"
   when: manual
   except: