From 678e7247c1e3cabc8cff04455cd0638c3a5d2b7a Mon Sep 17 00:00:00 2001
From: Jacob Kiers <jacob@jacobkiers.net>
Date: Fri, 16 Dec 2022 17:01:36 +0100
Subject: [PATCH] Try with full image

Signed-off-by: Jacob Kiers <jacob@jacobkiers.net>
---
 .drone.jsonnet | 52 +++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 7 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index be29d94..1ba6951 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,4 +1,4 @@
-local cross_image = 'img.kie.rs/jjkiers/rust-dind-cross:1.66-slim-pm';
+local cross_image = 'img.kie.rs/jjkiers/rust-dind-cross:1.66-full';
 
 local archs = [
   { target: 'aarch64-unknown-linux-gnu', short: 'arm64-gnu' },
@@ -16,6 +16,12 @@ local add_build_steps() = [
   {
     name: getStepName(arch),
     image: cross_image,
+    volumes: [
+      {
+        name: 'dockersock',
+        path: '/var/run',
+      },
+    ],
     commands: [
       'echo Hello World from Jsonnet on ' + arch.target + '!',
       'cross build --release --target ' + arch.target,
@@ -26,7 +32,7 @@ local add_build_steps() = [
     environment: {
       CROSS_REMOTE: true,
     },
-    depends_on: ['Start'],
+    depends_on: ['Wait for Docker'],
   }
   for arch in archs
 ];
@@ -40,15 +46,18 @@ local add_build_steps() = [
   },
   steps:
     [{
-      name: 'Start',
+      name: 'Wait for Docker',
       image: cross_image,
       commands: [
         'mkdir artifacts',
-        'while ! podman image ls; do sleep 1; done',
-        'podman info',
-        'podman pull hello-world:latest',
-        'podman run --rm hello-world:latest',
+        'while ! docker image ls; do sleep 1; done',
+        'docker info',
+        'docker pull hello-world:latest',
       ],
+      volumes: [{
+        name: 'dockersock',
+        path: '/var/run',
+      }],
     }] +
     add_build_steps() +
     [
@@ -78,5 +87,34 @@ local add_build_steps() = [
       },
     ],
 
+  services: [{
+    name: 'docker',
+    image: 'docker:dind',
+    privileged: true,
+    volumes: [
+      {
+        name: 'dockersock',
+        path: '/var/run',
+      },
+      {
+        name: 'docker-storage',
+        path: '/var/lib/docker',
+      },
+    ],
+  }],
+
+  volumes: [
+    {
+      name: 'dockersock',
+      temp: {},
+    },
+    {
+      name: 'docker-storage',
+      host: {
+        path: '/srv/drone/docker-dind-rust',
+      },
+    },
+  ],
+
   image_pull_secrets: ['docker_private_repo'],
 }