Release 4.x

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/main.yml

@@ -13,13 +13,13 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v5
       with:
-        go-version: 1.21
+        go-version: 1.22
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Get dependencies
       run: go get -v -t -d ./...

.github/workflows/release.yml

@@ -14,18 +14,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Prepare
         id: prepare
         run: |
             TAG=${GITHUB_REF#refs/tags/}
-            echo ::set-output name=tag_name::${TAG}
+            echo "tag_name=${TAG}" >> $GITHUB_OUTPUT
+
+      - name: Clean up
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Run GoReleaser
         run: |

.goreleaser.yml

@@ -3,11 +3,14 @@ project_name: dkron
 release:
   prerelease: auto
 
+env:
+  - IMAGE_PREFIX={{ if index .Env "IMAGE_PREFIX"  }}{{ .Env.IMAGE_PREFIX }}{{ else }}dkron{{ end }}
+
 builds:
   - &xbuild
-    main: ./builtin/bins/dkron-executor-http/
-    id: dkron-executor-http
-    binary: dkron-executor-http
+    main: .
+    id: dkron
+    binary: dkron
     env:
       - CGO_ENABLED=0
     goos:
@@ -22,12 +25,7 @@ builds:
     goarm:
       - '7'
     ldflags:
-      - -s -w
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-shell/
-    id: dkron-executor-shell
-    binary: dkron-executor-shell
+      - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
   - <<: *xbuild
     main: ./builtin/bins/dkron-executor-rabbitmq/
@@ -74,13 +72,6 @@ builds:
     id: dkron-processor-fluent
     binary: dkron-processor-fluent
 
-  - <<: *xbuild
-    main: .
-    id: dkron
-    binary: dkron
-    ldflags:
-      - -s -w -X github.com/distribworks/dkron/v3/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v3/dkron.Codename=Abaniko
-
 nfpms:
   -
     vendor: Distributed Works
@@ -119,15 +110,13 @@ snapshot:
 
 dockers:
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-amd64"
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
     goarch: amd64
     ids: &docker-ids
       - dkron
-      - dkron-executor-http
-      - dkron-executor-shell
       - dkron-executor-rabbitmq
       - dkron-executor-nats
       - dkron-executor-kafka
@@ -141,7 +130,7 @@ dockers:
       - --platform=linux/amd64
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-arm64"
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -151,7 +140,39 @@ dockers:
       - --platform=linux/arm64/v8
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-armv7"
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: arm
+    goarm: '7'
+    ids: *docker-ids
+    build_flag_templates:
+      - --platform=linux/arm/v7
+
+  - image_templates:
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-amd64"
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: amd64
+    ids: &docker-ids
+      - dkron
+    build_flag_templates:
+      - --platform=linux/amd64
+
+  - image_templates:
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-arm64"
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: arm64
+    ids: *docker-ids
+    build_flag_templates:
+      - --platform=linux/arm64/v8
+
+  - image_templates:
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-armv7"
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -162,17 +183,29 @@ dockers:
       - --platform=linux/arm/v7
 
 docker_manifests:
-  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}"
+    image_templates:
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-amd64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-arm64"
+      - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-armv7"
+
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:latest"
+    image_templates:
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-amd64"
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-arm64"
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-armv7"
+
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light"
     image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-      - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-      - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-amd64"
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-arm64"
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-armv7"
 
-  - name_template: dkron/{{ .ProjectName }}:latest
+  - name_template: "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:light"
     image_templates:
-    - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-amd64"
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-arm64"
+    - "{{ .Env.IMAGE_PREFIX }}/{{ .ProjectName }}:{{ .Version }}-light-armv7"
 
 changelog:
   sort: asc

Dockerfile

@@ -1,5 +1,5 @@
-FROM golang:1.18
-LABEL maintainer="Victor Castell <[email protected]>"
+FROM golang:1.22
+LABEL maintainer="Victor Castell <[email protected]>"
 
 EXPOSE 8080 8946
 

Dockerfile.light.hub

@@ -0,0 +1,15 @@
+FROM alpine:3.20
+LABEL maintainer="Victor Castell <[email protected]>"
+
+RUN set -x \
+	&& buildDeps='bash ca-certificates openssl tzdata' \
+	&& apk add --no-cache --update $buildDeps
+
+EXPOSE 8080 8946
+
+ENV SHELL /bin/bash
+COPY dkron /usr/local/bin/
+
+ENTRYPOINT ["/usr/local/bin/dkron"]
+
+CMD ["--help"]

Dockerfile.release

@@ -1,5 +1,5 @@
-FROM alpine:3.15
-LABEL maintainer="Victor Castell <[email protected]>"
+FROM alpine:3.20
+LABEL maintainer="Victor Castell <[email protected]>"
 
 RUN set -x \
 	&& buildDeps='bash ca-certificates openssl tzdata' \

Makefile

@@ -5,7 +5,7 @@ $(LINUX_PKGS):
 	fury push --as distribworks $@
 
 PACKAGE_NAME          := github.com/distribworks/dkron
-GOLANG_CROSS_VERSION  ?= v1.21.5
+GOLANG_CROSS_VERSION  ?= v1.22
 
 .PHONY: release-dry-run
 release-dry-run:
@@ -22,7 +22,7 @@ release-dry-run:
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
 		goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
-		--rm-dist --skip-validate --skip-publish --timeout=1h --parallelism=1
+		--clean --skip=validate,publish --timeout=1h --parallelism=1
 
 .PHONY: release
 release:
@@ -39,7 +39,7 @@ release:
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
 		goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
-		--rm-dist --skip-validate --timeout=1h
+		--clean --skip=validate --timeout=1h
 
 .PHONY: clean
 clean:
@@ -58,10 +58,14 @@ clean:
 	GOBIN=`pwd` go clean -i ./builtin/...
 	GOBIN=`pwd` go clean
 
-.PHONY: doc apidoc test ui updatetestcert
-doc:
-	#scripts/run doc --dir website/docs/cli
-	cd website; yarn build --out-dir ../public
+.PHONY: docs apidoc test ui updatetestcert
+docs:
+	# scripts/run doc --dir website/docs/cli
+
+	# Build with docker while bun reach compatibility with docusaurs
+	# cd website; bun run yarn build --out-dir ../public
+	docker run -v `pwd`:/app --workdir /app/website node yarn build --out-dir ../public
+
 	ghp-import -p public
 
 test:
@@ -72,24 +76,30 @@ localtest:
 
 updatetestcert:
 	wget https://badssl.com/certs/badssl.com-client.p12 -q -O badssl.com-client.p12
-	openssl pkcs12 -in badssl.com-client.p12 -nocerts -nodes -passin pass:badssl.com -out builtin/bins/dkron-executor-http/testdata/badssl.com-client-key-decrypted.pem
-	openssl pkcs12 -in badssl.com-client.p12 -nokeys -passin pass:badssl.com -out builtin/bins/dkron-executor-http/testdata/badssl.com-client.pem
+	openssl pkcs12 -in badssl.com-client.p12 -nocerts -nodes -passin pass:badssl.com -out plugin/http/testdata/badssl.com-client-key-decrypted.pem
+	openssl pkcs12 -in badssl.com-client.p12 -nokeys -passin pass:badssl.com -out plugin/http/testdata/badssl.com-client.pem
 	rm badssl.com-client.p12
 
 ui/node_modules: ui/package.json
-	cd ui; npm install
+	cd ui; bun install
 	# touch the directory so Make understands it is up to date
 	touch ui/node_modules
 
 dkron/ui-dist: ui/node_modules ui/public/* ui/src/* ui/src/*/*
-	cd ui; npm run-script build
+	rm -rf dkron/ui-dist
+	cd ui; bun run build --out-dir ../dkron/ui-dist
 
-plugin/types/%.pb.go: proto/%.proto
-	protoc -I proto/ --go_out=plugin/types --go_opt=paths=source_relative --go-grpc_out=plugin/types --go-grpc_opt=paths=source_relative $<
+proto: types/dkron.pb.go types/executor.pb.go types/pro.pb.go
+
+types/%.pb.go: proto/%.proto
+	protoc -I proto/ --go_out=types --go_opt=paths=source_relative --go-grpc_out=types --go-grpc_opt=paths=source_relative $<
+
+client:
+	oapi-codegen -package client website/static/openapi/openapi.yaml > client/client.go
 
 ui: dkron/ui-dist
 
-main: dkron/ui-dist plugin/types/dkron.pb.go plugin/types/executor.pb.go *.go */*.go */*/*.go */*/*/*.go
+main: dkron/ui-dist types/dkron.pb.go types/executor.pb.go *.go */*.go */*/*.go */*/*/*.go
 	GOBIN=`pwd` go install ./builtin/...
 	go mod tidy
 	go build main.go

builtin/bins/dkron-executor-gcppubsub/gcppubsub.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 
 	"cloud.google.com/go/pubsub"
-	dkplugin "github.com/distribworks/dkron/v3/plugin"
-	dktypes "github.com/distribworks/dkron/v3/plugin/types"
+	dkplugin "github.com/distribworks/dkron/v4/plugin"
+	dktypes "github.com/distribworks/dkron/v4/types"
 )
 
 // GCPPubSub plugin publish message to topic when Execute method is called.
@@ -24,12 +24,13 @@ const (
 
 // Execute Process method of the plugin
 // "executor": "gcppubsub",
-// "executor_config": {
-//  "project": "project-id",
-//  "topic": "topic-name",
-//  "data": "aGVsbG8gd29ybGQ=" // Optional. base64 encoded data
-//  "attributes": "{\"hello\":\"world\",\"waka\":\"paka\"}" // JSON serialized attributes
-// }
+//
+//	"executor_config": {
+//	 "project": "project-id",
+//	 "topic": "topic-name",
+//	 "data": "aGVsbG8gd29ybGQ=" // Optional. base64 encoded data
+//	 "attributes": "{\"hello\":\"world\",\"waka\":\"paka\"}" // JSON serialized attributes
+//	}
 func (g *GCPPubSub) Execute(args *dktypes.ExecuteRequest, _ dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) {
 	out, err := g.ExecuteImpl(args)
 	resp := &dktypes.ExecuteResponse{Output: out}
@@ -91,7 +92,7 @@ func configToPubSubMessage(config map[string]string) (*pubsub.Message, error) {
 
 	var attributes map[string]string
 	if attributesJSON != "" {
-		if err := json.Unmarshal([]byte(attributesJSON), &attributes); err != nil  {
+		if err := json.Unmarshal([]byte(attributesJSON), &attributes); err != nil {
 			return nil, fmt.Errorf("invalid attributes JSON: %w", err)
 		}
 		msg.Attributes = attributes

builtin/bins/dkron-executor-gcppubsub/gcppubsub_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"cloud.google.com/go/pubsub"
-	dktypes "github.com/distribworks/dkron/v3/plugin/types"
+	dktypes "github.com/distribworks/dkron/v4/types"
 	"github.com/stretchr/testify/assert"
 )
 

builtin/bins/dkron-executor-gcppubsub/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	dkplugin "github.com/distribworks/dkron/v3/plugin"
+	dkplugin "github.com/distribworks/dkron/v4/plugin"
 	"github.com/hashicorp/go-plugin"
 )