Merge pull request #183 from essentialkaos/develop

Version 3.0.1

.docker/alpine.docker

@@ -4,14 +4,13 @@ ARG REGISTRY="docker.io"
 
 ## BUILDER #####################################################################
 
-FROM golang:alpine3.18 as builder
+FROM ${REGISTRY}/essentialkaos/golang:alpine3.18 as builder
 
 WORKDIR /go/src/github.com/essentialkaos/sslcli
 
 COPY . .
 
-# hadolint ignore=DL3018
-RUN apk add --no-cache git make && make deps && make all
+RUN make deps && make all
 
 ## FINAL IMAGE #################################################################
 

.github/dependabot.yml

@@ -14,6 +14,12 @@ updates:
       - "andyone"
     reviewers:
       - "andyone"
+    groups:
+      all:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
 
   - package-ecosystem: "github-actions"
     directory: "/"

.github/workflows/docker-push.yml

@@ -135,7 +135,7 @@ jobs:
 
       - name: Build and push Docker images (Docker)
         if: ${{ steps.build_check.outputs.build == 'true' }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
@@ -148,7 +148,7 @@ jobs:
 
       - name: Build and push Docker images (GHCR)
         if: ${{ steps.build_check.outputs.build == 'true' }}
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .

Makefile

@@ -1,39 +1,40 @@
 ################################################################################
 
-# This Makefile generated by GoMakeGen 2.3.0 using next command:
+# This Makefile generated by GoMakeGen 3.0.2 using next command:
 # gomakegen --mod .
 #
 # More info: https://kaos.sh/gomakegen
 
 ################################################################################
 
-export GO111MODULE=on
-
 ifdef VERBOSE ## Print verbose information (Flag)
 VERBOSE_FLAG = -v
 endif
 
-COMPAT ?= 1.18
+COMPAT ?= 1.19
 MAKEDIR = $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 GITREV ?= $(shell test -s $(MAKEDIR)/.git && git rev-parse --short HEAD)
 
 ################################################################################
 
 .DEFAULT_GOAL := help
-.PHONY = fmt vet all clean deps update init vendor mod-init mod-update mod-download mod-vendor help
+.PHONY = fmt vet all install uninstall clean deps update init vendor mod-init mod-update mod-download mod-vendor help
 
 ################################################################################
 
 all: sslcli ## Build all binaries
 
 sslcli:
-	go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" sslcli.go
+	@echo "Building sslcli…"
+	@go build $(VERBOSE_FLAG) -ldflags="-X main.gitrev=$(GITREV)" sslcli.go
 
 install: ## Install all binaries
-	cp sslcli /usr/bin/sslcli
+	@echo "Installing binaries…"
+	@cp sslcli /usr/bin/sslcli
 
 uninstall: ## Uninstall all binaries
-	rm -f /usr/bin/sslcli
+	@echo "Removing installed binaries…"
+	@rm -f /usr/bin/sslcli
 
 init: mod-init ## Initialize new module
 
@@ -44,57 +45,70 @@ update: mod-update ## Update dependencies to the latest versions
 vendor: mod-vendor ## Make vendored copy of dependencies
 
 mod-init:
+	@echo "[1/2] Modules initialization…"
 ifdef MODULE_PATH ## Module path for initialization (String)
-	go mod init $(MODULE_PATH)
+	@go mod init $(MODULE_PATH)
 else
-	go mod init
+	@go mod init
 endif
 
+	@echo "[2/2] Dependencies cleanup…"
 ifdef COMPAT ## Compatible Go version (String)
-	go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
+	@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT) -go=$(COMPAT)
 else
-	go mod tidy $(VERBOSE_FLAG)
+	@go mod tidy $(VERBOSE_FLAG)
 endif
 
 mod-update:
+	@echo "[1/4] Updating dependencies…"
 ifdef UPDATE_ALL ## Update all dependencies (Flag)
-	go get -u $(VERBOSE_FLAG) all
+	@go get -u $(VERBOSE_FLAG) all
 else
-	go get -u $(VERBOSE_FLAG) ./...
+	@go get -u $(VERBOSE_FLAG) ./...
 endif
 
+	@echo "[2/4] Stripping toolchain info…"
+	@grep -q 'toolchain ' go.mod && go mod edit -toolchain=none || :
+
+	@echo "[3/4] Dependencies cleanup…"
 ifdef COMPAT
-	go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
+	@go mod tidy $(VERBOSE_FLAG) -compat=$(COMPAT)
 else
-	go mod tidy $(VERBOSE_FLAG)
+	@go mod tidy $(VERBOSE_FLAG)
 endif
 
-	test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
+	@echo "[4/4] Updating vendored dependencies…"
+	@test -d vendor && rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
 
 mod-download:
-	go mod download
+	@echo "Downloading dependencies…"
+	@go mod download
 
 mod-vendor:
-	rm -rf vendor && go mod vendor $(VERBOSE_FLAG)
+	@echo "Vendoring dependencies…"
+	@rm -rf vendor && go mod vendor $(VERBOSE_FLAG) || :
 
 fmt: ## Format source code with gofmt
-	find . -name "*.go" -exec gofmt -s -w {} \;
+	@echo "Formatting sources…"
+	@find . -name "*.go" -exec gofmt -s -w {} \;
 
 vet: ## Runs 'go vet' over sources
-	go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./...
+	@echo "Running 'go vet' over sources…"
+	@go vet -composites=false -printfuncs=LPrintf,TLPrintf,TPrintf,log.Debug,log.Info,log.Warn,log.Error,log.Critical,log.Print ./...
 
 clean: ## Remove generated files
-	rm -f sslcli
+	@echo "Removing built binaries…"
+	@rm -f sslcli
 
 help: ## Show this info
 	@echo -e '\n\033[1mTargets:\033[0m\n'
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
-		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-14s\033[0m %s\n", $$1, $$2}'
+		| awk 'BEGIN {FS = ":.*?## "}; {printf "  \033[33m%-9s\033[0m  %s\n", $$1, $$2}'
 	@echo -e '\n\033[1mVariables:\033[0m\n'
 	@grep -E '^ifdef [A-Z_]+ .*?## .*$$' $(abspath $(lastword $(MAKEFILE_LIST))) \
 		| sed 's/ifdef //' \
-		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-14s\033[0m %s\n", $$1, $$2}'
+		| awk 'BEGIN {FS = " .*?## "}; {printf "  \033[32m%-11s\033[0m  %s\n", $$1, $$2}'
 	@echo -e ''
-	@echo -e '\033[90mGenerated by GoMakeGen 2.3.0\033[0m\n'
+	@echo -e '\033[90mGenerated by GoMakeGen 3.0.2\033[0m\n'
 
 ################################################################################