From 185d99769471ca1ffa7775313871dc3f1e636ad8 Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Sat, 17 Feb 2024 16:10:52 +0100
Subject: [PATCH] feat: update image

Signed-off-by: kjuulh <contact@kjuulh.io>
---
 .drone.yml | 50 ++++----------------------------------------------
 1 file changed, 4 insertions(+), 46 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b10e283..48b78cc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -26,18 +26,15 @@ steps:
       - chmod 700 ~/.ssh/config
 
   - name: build pr
-    image: kasperhermansen/cuddle:latest
+    image: kasperhermansen/cuddle-rust-service-plan:main-1708174643
     pull: always
     volumes:
       - name: ssh
         path: /root/.ssh/
-      - name: ci
-        path: /mnt/ci
     commands:
       - eval `ssh-agent`
       - ssh-add
       - echo "$DOCKER_PASSWORD" | docker login  --password-stdin --username="$DOCKER_USERNAME" docker.io
-      - apk add git
       - export RUST_LOG=trace
       - cuddle-rust-service-plan pr
     environment:
@@ -49,13 +46,14 @@ steps:
       CUDDLE_SECRETS_PROVIDER: 1password
       CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
       CUDDLE_SSH_AGENT: "true"
-      CI_PREFIX: "/mnt/ci/ci"
       CUDDLE_PLEASE_TOKEN:
         from_secret: cuddle_please_token
       OP_SERVICE_ACCOUNT_TOKEN:
         from_secret: op_service_account_token
+      DOCKER_HOST: "tcp://192.168.1.233:2376"
     when:
       event:
+        - push
         - pull_request
       exclude:
         - main
@@ -64,7 +62,7 @@ steps:
       - "load_secret"
 
   - name: build main
-    image: kasperhermansen/cuddle-rust-service-plan:main-1707658158
+    image: kasperhermansen/cuddle-rust-service-plan:main-1708174643
     pull: always
     volumes:
       - name: ssh
@@ -94,7 +92,6 @@ steps:
       CUDDLE_SSH_AGENT: "true"
       GIT_PASSWORD:
         from_secret: git_password
-      CI_PREFIX: "/mnt/ci/ci"
       DOCKER_HOST: "tcp://192.168.1.233:2376"
       CUDDLE_PLEASE_TOKEN:
         from_secret: cuddle_please_token
@@ -111,45 +108,6 @@ steps:
     depends_on:
       - "load_secret"
 
-  - name: deploy release
-    image: kasperhermansen/cuddle:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-      - name: ci
-        path: /mnt/ci
-    commands:
-      - eval `ssh-agent`
-      - ssh-add
-      - echo "$DOCKER_PASSWORD" | docker login  --password-stdin --username="$DOCKER_USERNAME" docker.io
-      - apk add git
-      - cuddle x ci:release
-    environment:
-      DOCKER_BUILDKIT: 1
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      CUDDLE_SECRETS_PROVIDER: 1password
-      CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
-      CUDDLE_SSH_AGENT: "true"
-      CI_PREFIX: "/mnt/ci/ci"
-      CUDDLE_PLEASE_TOKEN:
-        from_secret: cuddle_please_token
-      OP_SERVICE_ACCOUNT_TOKEN:
-        from_secret: op_service_account_token
-    when:
-      event:
-        - tag
-      ref:
-        include:
-        - refs/tags/v*
-    depends_on:
-      - "load_secret"
-
 volumes:
   - name: ssh
     temp: {}