From 528a0ea97e8a0cc54131fc2606446ee40dc69b32 Mon Sep 17 00:00:00 2001
From: Jacob Kiers <jacob@jacobkiers.net>
Date: Fri, 16 Dec 2022 13:41:13 +0100
Subject: [PATCH] Use newer rust image

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

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 72a410c..5750c42 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -1,3 +1,5 @@
+local cross_image = 'img.kie.rs/jjkiers/rust-dind-cross:1.65-slim';
+
 local archs = [
   { target: 'aarch64-unknown-linux-gnu', short: 'arm64-gnu' },
   { target: 'aarch64-unknown-linux-musl', short: 'arm64-musl' },
@@ -13,16 +15,12 @@ local getExeName(arch) = if std.startsWith(arch.short, 'windows') then '.exe' el
 local add_build_steps() = [
   {
     name: getStepName(arch),
-    image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+    image: cross_image,
     volumes: [
       {
         name: 'dockersock',
         path: '/var/run',
       },
-      {
-        name: 'rustup',
-        path: '/usr/local/rustup',
-      },
     ],
     commands: [
       'echo Hello World from Jsonnet on ' + arch.target + '!',
@@ -48,12 +46,12 @@ local add_build_steps() = [
   steps:
     [{
       name: 'Wait for Docker',
-      image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+      image: cross_image,
       commands: [
+        'mkdir artifacts',
         'while ! docker image ls; do sleep 1; done',
         'docker info',
         'docker pull hello-world:latest',
-        'mkdir artifacts',
       ],
       volumes: [{
         name: 'dockersock',
@@ -64,7 +62,7 @@ local add_build_steps() = [
     [
       {
         name: 'Show built artifacts',
-        image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+        image: cross_image,
         commands: [
           'ls -lah artifacts',
         ],
@@ -115,12 +113,6 @@ local add_build_steps() = [
         path: '/srv/drone/docker-dind-rust',
       },
     },
-    {
-      name: 'rustup',
-      host: {
-        path: '/srv/drone/rustup',
-      },
-    },
   ],
 
   image_pull_secrets: ['docker_private_repo'],