Update Dockerfile

.drone.yml

@@ -1,35 +1,36 @@
+---
 kind: pipeline
-type: docker
+type: kubernetes
-name: default
+name: build
 
-platform:
+trigger:
-  os: linux
+  branch:
-  arch: amd64
+    - master
+
+clone:
+  # disable: true
+  depth: 1
+
+image_pull_secrets:
+- dockerconfig
 
 steps:
-  - name: test
-    image: golang:1.13
-    commands:
-      - go test ./cmd/... ./internal/...
-      - go vet ./cmd/... ./internal/...
-  - name: lint
-    image: cytopia/golint
-    commands:
-      - golint -set_exit_status ./cmd/... ./internal/...
-  - name: build
-    image: golang:1.13
-    commands:
-      - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/drone-helm cmd/drone-helm/main.go
   - name: publish_linux_amd64
-    image: plugins/docker
+    image: harbor.1sept.ru/drone/drone-kaniko
     settings:
-      auto_tag: true
+      registry: harbor.1sept.ru
-      username:
+      repo: drone/drone-helm3
-        from_secret: docker_username
+      cache: false
-      password:
+      tags:
-        from_secret: docker_password
+        - git-${DRONE_COMMIT_SHA:0:7}
-      repo:
+        - latest
-        from_secret: plugin_repo
+      username: 
-      dockerfile: Dockerfile
+        from_secret: harbor-username
-    when:
+      password: 
-      event: [ tag, push ]
+        from_secret: harbor-password
+
+---
+kind: signature
+hmac: ab275b41f1621072152d6e85b5f94289be8dda38debd2a177e0f666960491c6e
+
+...

.gitignore

@@ -20,3 +20,4 @@
 .secrets
 
 build/*
+**/.DS_Store

Dockerfile

@@ -1,10 +1,19 @@
-FROM alpine/helm:3.8.1
+FROM golang:1.24-alpine3.21 AS builder
-MAINTAINER Joachim Hill-Grannec <joachim@pelo.tech>
 
-COPY build/drone-helm /bin/drone-helm
+ENV GO111MODULE=on
-COPY assets/kubeconfig.tpl /root/.kube/config.tpl
+WORKDIR /app
 
-LABEL description="Helm 3 plugin for Drone 3"
+COPY --link go.mod .
-LABEL base="alpine/helm"
+COPY --link go.sum .
+RUN go mod download
+COPY --link . .
 
-ENTRYPOINT [ "/bin/drone-helm" ]
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /go/bin/drone-helm ./cmd/drone-helm
+
+# --- Copy the cli to an image with helm already installed ---
+FROM alpine/helm:3.18.5
+
+COPY --link --from=builder /go/bin/drone-helm /bin/drone-helm
+COPY --link ./assets/kubeconfig.tpl /root/.kube/config.tpl
+
+ENTRYPOINT [ "/bin/drone-helm" ]

Makefile

@@ -0,0 +1,9 @@
+help:
+	@echo "make check      - Check Dockerfile syntax"
+	@echo "make drone-sign - Sign Drone config file"
+
+check:
+	docker build --check .
+
+drone-sign:  ## Envs DRONE_SERVER & DRONE_TOKEN needed
+	drone sign --save 1sept/drone-helm3

internal/run/initkube.go

@@ -3,10 +3,11 @@ package run
 import (
 	"errors"
 	"fmt"
-	"github.com/pelotech/drone-helm3/internal/env"
 	"io"
 	"os"
 	"text/template"
+
+	"github.com/pelotech/drone-helm3/internal/env"
 )
 
 // InitKube is a step in a helm Plan that initializes the kubernetes config file.
@@ -87,7 +88,7 @@ func (i *InitKube) Prepare() error {
 		fmt.Fprintf(i.stderr, "kubeconfig file at %s\n", i.configFilename)
 	}
 
-	i.configFile, err = os.Create(i.configFilename)
+	i.configFile, err = os.OpenFile(i.configFilename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
 		return fmt.Errorf("could not open kubeconfig file for writing: %w", err)
 	}