From 011b57a762386953fba94e55d5384afd0e44abce Mon Sep 17 00:00:00 2001
From: Marcel Feix <marcel.feix@exxcellent.de>
Date: Tue, 14 Jun 2022 18:01:00 +0200
Subject: [PATCH] feat(Dind): Test dind containers

---
 .gitlab-ci.yml                                | 12 ++++++++++-
 .../docker-compose.yml                        |  0
 test/docker/test-dind.gitlab-ci.yml           | 21 +++++++++++++++++++
 .../test-docker-compose.gitlab-ci.yml         |  4 ++--
 4 files changed, 34 insertions(+), 3 deletions(-)
 rename test/{docker-compose => docker}/docker-compose.yml (100%)
 create mode 100644 test/docker/test-dind.gitlab-ci.yml
 rename test/{docker-compose => docker}/test-docker-compose.gitlab-ci.yml (90%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4367db4..f4dbcfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,18 @@ Test-Docker-compose:
   trigger:
     strategy: depend
     include:
-      - local: "test/docker-compose/test-docker-compose.gitlab-ci.yml"
+      - local: "test/docker/test-docker-compose.gitlab-ci.yml"
 
+Test-Dind:
+  stage: verify
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+      when: always
+    - when: manual
+  trigger:
+    strategy: depend
+    include:
+      - local: "test/docker/test-dind.gitlab-ci.yml"
 
 check_confluence_validity:
   extends: .documentation-check-confluence-validity
diff --git a/test/docker-compose/docker-compose.yml b/test/docker/docker-compose.yml
similarity index 100%
rename from test/docker-compose/docker-compose.yml
rename to test/docker/docker-compose.yml
diff --git a/test/docker/test-dind.gitlab-ci.yml b/test/docker/test-dind.gitlab-ci.yml
new file mode 100644
index 0000000..4dde479
--- /dev/null
+++ b/test/docker/test-dind.gitlab-ci.yml
@@ -0,0 +1,21 @@
+stages:
+  - verify
+
+services:
+  - name: docker:dind
+    # explicitly disable tls to avoid docker startup interruption
+    command: [ "--tls=false" ]
+
+variables:
+  # Instruct Testcontainers to use the daemon of DinD.
+  DOCKER_HOST: "tcp://docker:2375"
+  # Instruct Docker not to start over TLS.
+  DOCKER_TLS_CERTDIR: ""
+  # Improve performance with overlayfs.
+  DOCKER_DRIVER: overlay2
+
+test:
+  image: docker
+  stage: verify
+  script:
+    - docker run -it alpine echo test
\ No newline at end of file
diff --git a/test/docker-compose/test-docker-compose.gitlab-ci.yml b/test/docker/test-docker-compose.gitlab-ci.yml
similarity index 90%
rename from test/docker-compose/test-docker-compose.gitlab-ci.yml
rename to test/docker/test-docker-compose.gitlab-ci.yml
index 0af3577..64b1933 100644
--- a/test/docker-compose/test-docker-compose.gitlab-ci.yml
+++ b/test/docker/test-docker-compose.gitlab-ci.yml
@@ -17,8 +17,8 @@ Docker-compose:
   extends: .docker-compose-deploy
   variables:
     SCP_DESTINATION: "/home/user"
-    SCP_SOURCE: "$CI_PROJECT_DIR/test/docker-compose/docker-compose.yml"
-    COMPOSE_EXTRA_ARGS: "-f test/docker-compose/docker-compose.yml"
+    SCP_SOURCE: "$CI_PROJECT_DIR/test/docker/docker-compose.yml"
+    COMPOSE_EXTRA_ARGS: "-f test/docker/docker-compose.yml"
     SSH_PORT: "22"
     SSH_URL: "ci-cd.dev.exxcellent.de"
     SSH_USER: "user"