chore: cleanup Makefile

Author: shinsenter

Makefile

@@ -1,43 +1,48 @@
-# DOCKER
+# ===== Variables =====
 PACKAGE_VERSION := $(shell jq -r '.version' package.json)
 PACKAGE_MAJOR_VERSION := $(shell echo $(PACKAGE_VERSION) | cut -d. -f1)
+REPO := devthefuture/dockerfile-x
+PLATFORMS := linux/amd64,linux/arm64
 
+# ===== Docker =====
 setup-docker-multiarch:
-	docker buildx create --use --name mybuilder --driver docker-container
+	docker buildx create --use --name mybuilder --driver docker-container || true
 	docker buildx inspect mybuilder --bootstrap
 
 docker-build-dev:
-	docker buildx build --platform linux/amd64 -t devthefuture/dockerfile-x:dev --progress=plain . --push
+	docker buildx build --progress=plain --platform linux/amd64 -t $(REPO):dev . --push
 
 docker-build:
-	docker buildx build --platform linux/amd64,linux/arm64 -t devthefuture/dockerfile-x --progress=plain .
+	docker buildx build --progress=plain --platform $(PLATFORMS) -t $(REPO) .
 
 docker-push:
-	docker buildx build --platform linux/amd64,linux/arm64 -t devthefuture/dockerfile-x --progress=plain . --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t devthefuture/dockerfile-x:v$(PACKAGE_MAJOR_VERSION) --progress=plain . --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t devthefuture/dockerfile-x:v$(PACKAGE_VERSION) --progress=plain . --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t devthefuture/dockerfile-x:$(PACKAGE_MAJOR_VERSION) --progress=plain . --push
-	docker buildx build --platform linux/amd64,linux/arm64 -t devthefuture/dockerfile-x:$(PACKAGE_VERSION) --progress=plain . --push
-
-# GO
-
+	docker buildx build \
+		--progress=plain \
+		--platform $(PLATFORMS) \
+		-t $(REPO) \
+		-t $(REPO):$(PACKAGE_MAJOR_VERSION) \
+		-t $(REPO):v$(PACKAGE_MAJOR_VERSION) \
+		-t $(REPO):$(PACKAGE_VERSION) \
+		-t $(REPO):v$(PACKAGE_VERSION) \
+		. --push
+
+# ===== Go =====
 go-version:
-	gvm install go1.25
+	gvm install go1.25 || true
 	gvm use 1.25
-	
+
 go-deps:
 	go mod tidy
 	go mod vendor
 
 go-build:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod vendor -ldflags '-w -extldflags "-static"' -o dist-bin/dockerfile-x-frontend .
-
-
-# NODE
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
+		go build -mod=vendor -trimpath -ldflags='-s -w -extldflags "-static"' \
+		-o dist-bin/dockerfile-x-frontend .
 
+# ===== Node =====
 node-deps:
 	yarn
 
 node-build: node-deps
-	yarn build
-
+	yarn build