From d4eacd3eef5431059621760cc89d9de3c503d80e Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Sat, 13 Aug 2022 12:21:31 +0200
Subject: [PATCH] with docker dind

---
 .drone.yml                              | 30 ++++++++++++++++++++-----
 templates/build_cuddle_image.Dockerfile |  7 +++---
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index af93f69..8817be3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -32,18 +32,38 @@ steps:
       - ls $HOME/.ssh/
       - cat $HOME/.ssh/id_ed25519
 
+        #  - name: build
+        #    image: quay.io/testcontainers/dind-drone-plugin
+        #    settings:
+        #      build_image: kasperhermansen/cuddle:latest
+        #      cmd: sleep 3 && cuddle_cli x build_cuddle_image
+        #    volumes:
+        #      - name: ssh
+        #        path: /root/.ssh/
+        #      - name: dockersock
+        #        path: /var/run
+        #    environment:
+        #      CI_WORKSPACE: "/drone/src"
+        #      DOCKER_BUILDKIT: 1
+        #      DOCKER_USERNAME:
+        #        from_secret: docker_username
+        #      DOCKER_PASSWORD:
+        #        from_secret: docker_password
+        #    depends_on:
+        #      - "load_secret"
+        #      - "server"
+
   - name: build
-    image: quay.io/testcontainers/dind-drone-plugin
-    settings:
-      build_image: kasperhermansen/cuddle:latest
-      cmd: sleep 3 && cuddle_cli x build_cuddle_image
+    image: kasperhermansen/cuddle:latest
     volumes:
       - name: ssh
         path: /root/.ssh/
       - name: dockersock
         path: /var/run
+    commands:
+      - sleep 5
+      - cuddle x build_cuddle_image
     environment:
-      CI_WORKSPACE: "/drone/src"
       DOCKER_BUILDKIT: 1
       DOCKER_USERNAME:
         from_secret: docker_username
diff --git a/templates/build_cuddle_image.Dockerfile b/templates/build_cuddle_image.Dockerfile
index 5463354..a5b34cd 100644
--- a/templates/build_cuddle_image.Dockerfile
+++ b/templates/build_cuddle_image.Dockerfile
@@ -11,6 +11,7 @@ WORKDIR /app/cuddle/
 RUN cargo install --git https://git.front.kjuulh.io/kjuulh/cuddle.git cuddle_cli
 RUN export PATH="$PATH:/usr/local/cargo/bin/"
 
-#FROM docker:stable-dind
-#COPY --from=base /usr/local/cargo/bin/ /usr/local/cargo/bin/
-#RUN export PATH="$PATH:/usr/local/cargo/bin/"
+FROM docker:stable-dind
+
+COPY --from=base /usr/local/cargo/bin/ /usr/local/cargo/bin/
+RUN export PATH="$PATH:/usr/local/cargo/bin/"