From 7eaa667869fa268ffa40781572b7ff97d96e77ea Mon Sep 17 00:00:00 2001 From: Jacob Kiers Date: Sat, 10 Jun 2023 12:54:24 +0200 Subject: [PATCH] Fully remove docker-in-docker and cross Signed-off-by: Jacob Kiers --- .drone.jsonnet | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 881a26e..cfa877d 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -30,7 +30,6 @@ local add_build_steps() = [ 'cp target/' + arch.target + '/release/' + builtExecutableName(arch) + ' artifacts/' + targetExecutableName(arch), 'rm -rf target/' + arch.target + '/release/*', ], - depends_on: ['Wait for Docker'], } for arch in archs ]; @@ -43,26 +42,6 @@ local add_build_steps() = [ arch: 'amd64', }, steps: - [{ - name: 'Wait for Docker', - image: build_image, - commands: [ - 'mkdir artifacts', - 'echo Using image: ' + build_image, - 'while ! docker image ls; do sleep 1; done', - 'cargo --version', - 'rustc --version', - 'docker info', - 'docker pull hello-world:latest', - ], - environment: { - CROSS_REMOTE: true, - }, - volumes: [{ - name: 'dockersock', - path: '/var/run', - }], - }] + add_build_steps() + [ { @@ -91,28 +70,5 @@ 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: {}, - }, - ], - image_pull_secrets: ['docker_private_repo'], }