diff --git a/.drone.jsonnet b/.drone.jsonnet index 17da317..ea08baf 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,4 +1,4 @@ -local cross_image = 'img.kie.rs/jjkiers/rust-dind-cross:1.66-slim'; +local cross_image = 'img.kie.rs/jjkiers/rust-dind-cross:1.66-sli-pm'; local archs = [ { target: 'aarch64-unknown-linux-gnu', short: 'arm64-gnu' }, @@ -16,12 +16,6 @@ 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, @@ -46,18 +40,15 @@ local add_build_steps() = [ }, steps: [{ - name: 'Wait for Docker', + name: 'Start', image: cross_image, commands: [ 'mkdir artifacts', - 'while ! docker image ls; do sleep 1; done', - 'docker info', - 'docker pull hello-world:latest', + 'while ! podman image ls; do sleep 1; done', + 'podman info', + 'podman pull hello-world:latest', + 'podman run --rm hello-world:latest', ], - volumes: [{ - name: 'dockersock', - path: '/var/run', - }], }] + add_build_steps() + [ @@ -87,34 +78,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: {}, - }, - { - name: 'docker-storage', - host: { - path: '/srv/drone/docker-dind-rust', - }, - }, - ], - image_pull_secrets: ['docker_private_repo'], }