diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..06fc12f46102a7cef566fb02e149ae7dee7b09bf
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+# DinD service is required for Testcontainers
+services:
+  - docker:18-dind
+
+stages:
+ - build
+
+variables:
+ # Instruct Testcontainers to use the daemon of DinD.
+  DOCKER_HOST: "tcp://docker:2375"
+  # Improve performance with overlayfs.
+  DOCKER_DRIVER: overlay2
+  CONTAINER_IMAGE: registry.mygit.th-deg.de/$CI_PROJECT_PATH
+
+before_script:
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.mygit.th-deg.de
+
+build:
+  stage: build
+  script:
+    - docker pull $CONTAINER_IMAGE:latest || true
+    - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:latest .
+    - docker push $CONTAINER_IMAGE:latest
+
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index f502ce8a0b6c8c00953fd08db842abd072ea46f1..49819c8890aea52cf0b514c4388ca3b08ab5b58a 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,6 +2,14 @@
 
 sudo service ssh start
 
+die_func() {
+        echo "shutdown"
+        exit 1
+}
+trap die_func TERM
+trap die_func INT
+
+
 if [ ! -d "/tmp/hadoop-hduser/dfs/name" ]; then
         $HADOOP_HOME/bin/hdfs namenode -format
 fi
@@ -9,4 +17,8 @@ fi
 $HADOOP_HOME/sbin/start-dfs.sh
 $HADOOP_HOME/sbin/start-yarn.sh
 
-bash
+while pidof java
+do
+    sleep 10 &
+    wait
+done