Merge branch 'rc3.0-tmp'

# Conflicts:
#	.gitlab-ci.yml

.gitlab-ci.yml

@@ -49,5 +49,7 @@ build-server-docker:
     - cd cdo_server_oxygen/server-core/src/main/docker/
     - cp ../../../target/server-core.jar .
   script:
-    - docker build -t cdo-server .
-    
\ No newline at end of file
+    - echo "$K8S_SECRET_DOCKER_PASSWORD" | docker login $CI_REGISTRY -u $K8S_SECRET_DOCKER_USER --password-stdin
+    - docker build -t $CI_REGISTRY_IMAGE/cdo-server:$CI_COMMIT_BRANCH .
+    - docker push $CI_REGISTRY_IMAGE/cdo-server:$CI_COMMIT_BRANCH
+