Typo

Signed-off-by: Jacob Kiers <jacob@jacobkiers.net>

.cargo/config.toml

@@ -0,0 +1,3 @@
+[profile.release]
+lto = "thin"
+strip = true

.drone.jsonnet

@@ -1,3 +1,5 @@
+local cross_image = 'img.kie.rs/jjkiers/rust-dind-cross:1.66-full';
+
 local archs = [
   { target: 'aarch64-unknown-linux-gnu', short: 'arm64-gnu' },
   { target: 'aarch64-unknown-linux-musl', short: 'arm64-musl' },
@@ -13,25 +15,23 @@ 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,
+    pull: true,
     volumes: [
       {
         name: 'dockersock',
-        path: '/var/run',
+        path: '/var/run/docker.sock',
-      },
-      {
-        name: 'rustup',
-        path: '/usr/local/rustup',
       },
     ],
     commands: [
       'echo Hello World from Jsonnet on ' + arch.target + '!',
       'cross build --release --target ' + arch.target,
+      'ls -lahR',
       'cp target/' + arch.target + '/release/drone-test' + getExeName(arch) + ' artifacts/drone-test-' + arch.short + getExeName(arch),
       'rm -rf target/' + arch.target + '/release/*',
     ],
     environment: {
-      CROSS_REMOTE: true,
+      CROSS_DOCKER_IN_DOCKER: true,
     },
     depends_on: ['Wait for Docker'],
   }
@@ -48,23 +48,28 @@ local add_build_steps() = [
   steps:
     [{
       name: 'Wait for Docker',
-      image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+      image: cross_image,
+      pull: true,
       commands: [
+        'mkdir artifacts',
         'while ! docker image ls; do sleep 1; done',
         'docker info',
         'docker pull hello-world:latest',
-        'mkdir artifacts',
+        'docker run --rm hello-world:latest',
       ],
+      environment: {
+        CROSS_DOCKER_IN_DOCKER: true,
+      },
       volumes: [{
         name: 'dockersock',
-        path: '/var/run',
+        path: '/var/run/docker.sock',
       }],
     }] +
     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',
         ],
@@ -88,37 +93,11 @@ 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',
+        path: '/var/run/docker.sock',
-      },
-    },
-    {
-      name: 'rustup',
-      host: {
-        path: '/srv/drone/rustup',
       },
     },
   ],

.drone.yml

@@ -1,42 +0,0 @@
----
-kind: pipeline
-name: default
-
-platfomr:
-  arch: amd64
-
-steps:
-- name: test
-  image:  img.kie.rs/jjkiers/rust-dind-cross:1.62-slim
-  volumes:
-  - name: dockersock
-    path: /var/run
-  commands:
-  - cargo check
-  - while ! docker image ls; do sleep 1; done
-  - cross build --release --target aarch64-unknown-linux-gnu
-  - ls -lahR target/
-  environment:
-    CROSS_REMOTE: true
-    # DOCKER_REGISTRY:
-    #   from_secret: docker-registry-url
-    # DOCKER_USERNAME:
-    #   from_secret: docker-registry-username
-    # DOCKER_PASSWORD:
-    #   from_secret: docker-registry-password
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock
-    path: /var/run
-
-volumes:
-- name: dockersock
-  temp: {}
-
-
-image_pull_secrets:
-- docker_private_repo

drone.jsonnet.rust

@@ -0,0 +1,130 @@
+local archs = [
+  { target: 'aarch64-unknown-linux-gnu', short: 'arm64-gnu' },
+  { target: 'aarch64-unknown-linux-musl', short: 'arm64-musl' },
+  { target: 'x86_64-pc-windows-gnu', short: 'windows-amd64' },
+  { target: 'x86_64-unknown-linux-gnu', short: 'amd64-gnu' },
+  { target: 'x86_64-unknown-linux-musl', short: 'amd64-musl' },
+];
+
+local getStepName(arch) = 'Build for ' + arch.short;
+
+local getExeName(arch) = if std.startsWith(arch.short, 'windows') then '.exe' else '';
+
+local add_build_steps() = [
+  {
+    name: getStepName(arch),
+    image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+    volumes: [
+      {
+        name: 'dockersock',
+        path: '/var/run',
+      },
+      {
+        name: 'rustup',
+        path: '/usr/local/rustup',
+      },
+    ],
+    commands: [
+      'echo Hello World from Jsonnet on ' + arch.target + '!',
+      'cross build --release --target ' + arch.target,
+      'cp target/' + arch.target + '/release/drone-test' + getExeName(arch) + ' artifacts/drone-test-' + arch.short + getExeName(arch),
+      'rm -rf target/' + arch.target + '/release/*',
+    ],
+    environment: {
+      CROSS_REMOTE: true,
+    },
+    depends_on: ['Wait for Docker'],
+  }
+  for arch in archs
+];
+
+{
+  kind: 'pipeline',
+  type: 'vm',
+  name: 'default',
+  pool: {
+    use: 'drone-ci-pool',
+  },
+  platform: {
+    arch: 'amd64',
+  },
+  steps:
+    [{
+      name: 'Wait for Docker',
+      image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+      commands: [
+        'while ! docker image ls; do sleep 1; done',
+        'docker info',
+        'docker pull hello-world:latest',
+        'mkdir artifacts',
+      ],
+      volumes: [{
+        name: 'dockersock',
+        path: '/var/run',
+      }],
+    }] +
+    add_build_steps() +
+    [
+      {
+        name: 'Show built artifacts',
+        image: 'img.kie.rs/jjkiers/rust-dind-cross:1.62-slim',
+        commands: [
+          'ls -lah artifacts',
+        ],
+        depends_on: [getStepName(a) for a in archs],
+      },
+      {
+        name: 'Create release on gitea',
+        image: 'plugins/gitea-release',
+        settings: {
+          api_key: {
+            from_secret: 'gitea_token',
+          },
+          base_url: 'https://code.kiers.eu',
+          files: 'artifacts/*',
+          checksum: 'sha256',
+        },
+        when: {
+          event: ['tag', 'promote'],
+        },
+        depends_on: ['Show built artifacts'],
+      },
+    ],
+
+  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',
+      },
+    },
+    {
+      name: 'rustup',
+      host: {
+        path: '/srv/drone/rustup',
+      },
+    },
+  ],
+
+  image_pull_secrets: ['docker_private_repo'],
+}

src/main.rs

@@ -1,3 +1,3 @@
 fn main() {
-    println!("Hello, world!");
+    println!("Hello from Drone!");
 }