Release 4.x

.github/workflows/release.yml

@@ -24,6 +24,13 @@ jobs:
             TAG=${GITHUB_REF#refs/tags/}
             echo ::set-output name=tag_name::${TAG}
 
+      - 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
 

.goreleaser.yml

@@ -5,9 +5,9 @@ release:
 
 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 +22,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 +69,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
@@ -126,8 +114,6 @@ dockers:
     goarch: amd64
     ids: &docker-ids
       - dkron
-      - dkron-executor-http
-      - dkron-executor-shell
       - dkron-executor-rabbitmq
       - dkron-executor-nats
       - dkron-executor-kafka
@@ -161,6 +147,38 @@ dockers:
     build_flag_templates:
       - --platform=linux/arm/v7
 
+  - image_templates:
+      - dkron/{{ .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:
+      - dkron/{{ .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:
+      - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: arm
+    goarm: '7'
+    ids: *docker-ids
+    build_flag_templates:
+      - --platform=linux/arm/v7
+
 docker_manifests:
   - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
     image_templates:
@@ -174,6 +192,12 @@ docker_manifests:
     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
+  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}-light
+    image_templates:
+    - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
+    - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
+    - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+
 changelog:
   sort: asc
   filters:

Dockerfile

@@ -1,5 +1,5 @@
-FROM golang:1.18
-LABEL maintainer="Victor Castell <victor@victorcastell.com>"
+FROM golang:1.21
+LABEL maintainer="Victor Castell <0x@vcastellm.xyz>"
 
 EXPOSE 8080 8946
 

Dockerfile.light.hub

@@ -0,0 +1,15 @@
+FROM alpine:3.19
+LABEL maintainer="Victor Castell <0x@vcastellm.xyz>"
+
+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 <victor@victorcastell.com>"
+FROM alpine:3.19
+LABEL maintainer="Victor Castell <0x@vcastellm.xyz>"
 
 RUN set -x \
 	&& buildDeps='bash ca-certificates openssl tzdata' \

Makefile

@@ -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"
 )
 

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

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/armon/circbuf"
-	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"
 	"github.com/fullstorydev/grpcurl"
 	"github.com/jhump/protoreflect/grpcreflect"
 	"github.com/pkg/errors"
@@ -33,12 +33,13 @@ type GRPC struct{}
 
 // Execute Process method of the plugin
 // "executor": "grpc",
-// "executor_config": {
-//     "url": "127.0.0.1:9000/demo.DemoService/Demo", // Request url
-//     "body": "",                                    // POST body
-//     "timeout": "30",                               // Request timeout, unit seconds
-//     "expectCode": "0",                             // Expect response code, any of the described here https://grpc.github.io/grpc/core/md_doc_statuscodes.html
-// }
+//
+//	"executor_config": {
+//	    "url": "127.0.0.1:9000/demo.DemoService/Demo", // Request url
+//	    "body": "",                                    // POST body
+//	    "timeout": "30",                               // Request timeout, unit seconds
+//	    "expectCode": "0",                             // Expect response code, any of the described here https://grpc.github.io/grpc/core/md_doc_statuscodes.html
+//	}
 func (g *GRPC) Execute(args *dktypes.ExecuteRequest, _ dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) {
 	out, err := g.ExecuteImpl(args)
 	resp := &dktypes.ExecuteResponse{Output: out}

builtin/bins/dkron-executor-grpc/grpc_test.go

@@ -2,12 +2,13 @@ package main
 
 import (
 	"context"
-	"github.com/distribworks/dkron/v3/builtin/bins/dkron-executor-grpc/test"
-	dktypes "github.com/distribworks/dkron/v3/plugin/types"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/reflection"
 	"net"
 	"testing"
+
+	"github.com/distribworks/dkron/v4/builtin/bins/dkron-executor-grpc/test"
+	dktypes "github.com/distribworks/dkron/v4/types"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/reflection"
 )
 
 type DemoServer struct {

builtin/bins/dkron-executor-grpc/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"
 )
 

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

@@ -9,8 +9,8 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/armon/circbuf"
 
-	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"
 )
 
 const (
@@ -26,12 +26,13 @@ type Kafka struct {
 
 // Execute Process method of the plugin
 // "executor": "kafka",
-// "executor_config": {
-//     "brokerAddress": "192.168.59.103:9092", // kafka broker url
-//     "key": "",
-//     "message": "",
-//     "topic": "publishTopic"
-// }
+//
+//	"executor_config": {
+//	    "brokerAddress": "192.168.59.103:9092", // kafka broker url
+//	    "key": "",
+//	    "message": "",
+//	    "topic": "publishTopic"
+//	}
 func (s *Kafka) Execute(args *dktypes.ExecuteRequest, cb dkplugin.StatusHelper) (*dktypes.ExecuteResponse, error) {
 
 	out, err := s.ExecuteImpl(args)

builtin/bins/dkron-executor-kafka/kafka_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	dktypes "github.com/distribworks/dkron/v3/plugin/types"
+	dktypes "github.com/distribworks/dkron/v4/types"
 )
 
 func TestProduceExecuteWithKey(t *testing.T) {
@@ -44,4 +44,4 @@ func TestProduceExecuteWithoutKey(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-}
+}

builtin/bins/dkron-executor-kafka/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"
 )