Merge branch 'master' of git@git.industrial-devops.org:soerenhenning/scalability-benchmarking.git

.gitlab-ci.yml

@@ -50,23 +50,27 @@ test:
     - dockerex
   script: ./gradlew spotbugs
 
-.deploy-exp-bigdata19-bridge:
+.deploy:
   stage: deploy
   tags:
     - dockerex
-  image: docker:latest
+  # see https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
+  # for image usage and settings for building with TLS and docker in docker
+  image: docker:19.03.1
   services:
-    - docker:dind
+    - docker:19.03.1-dind
+  variables:
+    DOCKER_TLS_CERTDIR: "/certs"
   script:
     - DOCKER_TAG_NAME=$(echo $CI_COMMIT_REF_SLUG- | sed 's/^master-$//')
     - docker build --pull -t titan-ccp-exp-bigdata19-bridge ./exp-bigdata19-bridge
-    - docker tag titan-ccp-exp-bigdata19-bridge industrialdevops/titan-ccp-exp-bigdata19-bridge:${DOCKER_TAG_NAME}latest
-    - docker tag titan-ccp-exp-bigdata19-bridge industrialdevops/titan-ccp-exp-bigdata19-bridge:$DOCKER_TAG_NAME$(date +%Y%m%d%H%M%S)
-    - docker tag titan-ccp-exp-bigdata19-bridge industrialdevops/titan-ccp-exp-bigdata19-bridge:$DOCKER_TAG_NAME$CI_COMMIT_SHA
+    - docker tag titan-ccp-exp-bigdata19-bridge $DOCKERHUB_ORG/titan-ccp-exp-bigdata19-bridge:${DOCKER_TAG_NAME}latest
+    - docker tag titan-ccp-exp-bigdata19-bridge $DOCKERHUB_ORG/titan-ccp-exp-bigdata19-bridge:$DOCKER_TAG_NAME$CI_COMMIT_SHA
     - echo $DOCKERHUB_PW | docker login -u $DOCKERHUB_ID --password-stdin
-    - docker push industrialdevops/titan-ccp-exp-bigdata19-bridge
+    - docker push $DOCKERHUB_ORG/titan-ccp-exp-bigdata19-bridge
     - docker logout
   only:
     variables:
+      - $DOCKERHUB_ORG
       - $DOCKERHUB_ID
       - $DOCKERHUB_PW
\ No newline at end of file

README.md

+Current envisaged project structure:
+
+
+* `scalability-benchmarking`
+    * `uc1-application-kstreams`
+    * `uc1-application-samza`
+    * `uc1-workload-generation`
+    * ...