.drone.yml

@@ -1,62 +0,0 @@
-kind: pipeline
-name: default
-type: docker
-
-steps:
-  - name: load_secret
-    image: debian:buster-slim
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-    environment:
-      SSH_KEY:
-        from_secret: gitea_id_ed25519
-    commands:
-      - mkdir -p $HOME/.ssh/
-      - echo "$SSH_KEY" > $HOME/.ssh/id_ed25519
-      - ls $HOME/.ssh/
-      - cat $HOME/.ssh/id_ed25519
-
-  - name: build
-    image: kasperhermansen/cuddle-image:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-    commands:
-      - apk add bash
-      - cuddle_cli x build_cuddle_image
-    environment:
-      DOCKER_BUILDKIT: 1
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-    depends_on:
-      - "load_secret"
-
-  - name: send telegram notification
-    image: appleboy/drone-telegram
-    settings:
-      token:
-        from_secret: telegram_token
-      to: 2129601481
-      format: markdown
-    when:
-      status: [failure]
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock
-    path: /var/run
-
-volumes:
-  - name: ssh
-    temp: {}
-  - name: dockersock
-    temp: {}

cuddle.yaml

@@ -1,18 +0,0 @@
-# yaml-language-server: $schema=https://git.front.kjuulh.io/kjuulh/cuddle/raw/branch/main/schemas/base.json
-
-base: "git@git.front.kjuulh.io:kjuulh/cuddle-base.git"
-
-vars:
-  service: "cuddle-image"
-  registry: kasperhermansen
-
-scripts:
-  build_cuddle_image:
-    type: shell
-    args:
-      docker_username:
-        key: "DOCKER_USERNAME"
-        type: env
-      docker_password:
-        key: "DOCKER_PASSWORD"
-        type: env

cuddle_cli/src/cli/mod.rs

@@ -9,7 +9,6 @@ use clap::Command;
 
 use crate::{
     actions::CuddleAction,
-    config::{CuddleConfig, CuddleFetchPolicy},
     context::{CuddleContext, CuddleTreeType},
     model::*,
     util::git::GitCommit,
@@ -24,21 +23,16 @@ pub struct CuddleCli<'a> {
     context: Arc<Mutex<Vec<CuddleContext>>>,
     command: Option<Command<'a>>,
     tmp_dir: Option<PathBuf>,
-    config: CuddleConfig,
 }
 
 impl<'a> CuddleCli<'a> {
-    pub fn new(
+    pub fn new(context: Arc<Mutex<Vec<CuddleContext>>>) -> anyhow::Result<CuddleCli<'a>> {
-        context: Arc<Mutex<Vec<CuddleContext>>>,
-        config: CuddleConfig,
-    ) -> anyhow::Result<CuddleCli<'a>> {
         let mut cli = CuddleCli {
             scripts: vec![],
             variables: vec![],
             context: context.clone(),
             command: None,
             tmp_dir: None,
-            config,
         };
 
         cli = cli
@@ -112,13 +106,8 @@ impl<'a> CuddleCli<'a> {
             .tmp_dir
             .clone()
             .ok_or(anyhow::anyhow!("tmp_dir does not exist aborting"))?;
-        match self.config.get_fetch_policy()? {
+        if tmp_dir.exists() && tmp_dir.ends_with("tmp") {
-            CuddleFetchPolicy::Always => {
+            std::fs::remove_dir_all(tmp_dir.clone())?;
-                if tmp_dir.exists() && tmp_dir.ends_with("tmp") {
-                    std::fs::remove_dir_all(tmp_dir.clone())?;
-                }
-            }
-            _ => {}
         }
         std::fs::create_dir_all(tmp_dir.clone())?;
         // Handle all templating with variables and such.

cuddle_cli/src/config.rs

@@ -6,7 +6,7 @@ pub enum CuddleFetchPolicy {
     Never,
 }
 
-#[derive(Envconfig, Clone, Debug)]
+#[derive(Envconfig, Clone)]
 pub struct CuddleConfig {
     #[envconfig(from = "CUDDLE_FETCH_POLICY", default = "once")]
     fetch_policy: String,

cuddle_cli/src/main.rs

@@ -14,7 +14,7 @@ fn main() -> anyhow::Result<()> {
     let config = CuddleConfig::from_env()?;
 
     let context = context::extract_cuddle(config.clone())?;
-    _ = cli::CuddleCli::new(context, config)?.execute()?;
+    _ = cli::CuddleCli::new(context)?.execute()?;
 
     Ok(())
 }

scripts/build_cuddle_image.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-tag="$REGISTRY/$SERVICE:${COMMIT_SHA:0:10}"
-latest_tag="$REGISTRY/$SERVICE:latest"
-
-echo "logging in"
-docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-
-echo "building image"
-DOCKER_BUILDKIT=1 docker build -t "$tag" -t "$latest_tag" -f "$TMP/build_cuddle_image.Dockerfile" .
-
-echo "pushing image"
-docker push "$tag"
-docker push "$latest_tag"

templates/build_cuddle_image.Dockerfile

@@ -1,23 +0,0 @@
-FROM rust:1.62.1-slim-bullseye as base
-
-RUN rustup target add x86_64-unknown-linux-musl
-
-RUN apt-get update -qq && \
-  apt-get install -y \
-  musl-tools \
-  musl-dev
-
-RUN update-ca-certificates
-
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y -q build-essential curl git
-
-WORKDIR /app/cuddle/
-
-RUN cargo install --target x86_64-unknown-linux-musl --git https://git.front.kjuulh.io/kjuulh/cuddle.git cuddle_cli
-
-FROM docker:stable-dind
-
-COPY --from=base /usr/local/cargo/bin/ /usr/local/cargo/bin/
-ENV PATH="${PATH}:/usr/local/cargo/bin"
-

templates/build_cuddle_image.Dockerfile.dockerignore

@@ -1,2 +0,0 @@
-.cuddle/
-.git/