From f092a0d59c4f233efbe8653b3b0e6a09be27abb3 Mon Sep 17 00:00:00 2001
From: Jack Baldry <jack.baldry@grafana.com>
Date: Wed, 8 Jan 2025 11:13:06 +0000
Subject: [PATCH] Add Hugo package to Vale config to make it easy for other
 users to fetch the package (#941)

---
 vale/.vale.ini |  2 +-
 vale/Makefile  | 29 +++++++++++++----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/vale/.vale.ini b/vale/.vale.ini
index 7bd007f72..d2f0ed1d8 100644
--- a/vale/.vale.ini
+++ b/vale/.vale.ini
@@ -1,5 +1,5 @@
 MinAlertLevel = suggestion
-Packages = Grafana
+Packages = Grafana, https://github.com/errata-ai/Hugo/releases/download/v0.2.0/Hugo.zip
 
 [*]
 BasedOnStyles = Grafana
diff --git a/vale/Makefile b/vale/Makefile
index d78f9112b..0d1a6ce63 100644
--- a/vale/Makefile
+++ b/vale/Makefile
@@ -11,7 +11,6 @@ help: ## Display this help
 help:
 	@awk 'BEGIN {FS = ": ##"; printf "Usage:\n  make <target>\n\nTargets:\n"} /^[a-zA-Z0-9_\.\-\/% ]+: ##/ { printf "  %-45s %s\n", $$1, $$2 }' $(MAKEFILE_LIST)
 
-PODMAN := $(shell if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)
 SHORT_SHA := $(shell git rev-parse --short HEAD)
 GIT_ROOT := $(shell git rev-parse --show-toplevel)
 
@@ -32,25 +31,23 @@ Grafana/styles/config/dictionaries/en_US-grafana.%: dictionary.libsonnet
 .PHONY: grafana/vale
 grafana/vale: ## Builds a container image for Vale with the Grafana style loaded.
 grafana/vale: Grafana/styles/config/dictionaries/en_US-grafana.aff Grafana/styles/config/dictionaries/en_US-grafana.dic Grafana/styles/Grafana/Google .vale.ini
-	podman manifest create --amend grafana/vale:latest
-	podman manifest create --amend grafana/vale:$(SHORT_SHA)
-	podman buildx build \
-		--manifest grafana/vale:latest \
+	docker buildx build \
 		--platform linux/x86_64,linux/arm64 \
-		--progress plain \
-			.
-	podman buildx build \
-		--manifest grafana/vale:$(SHORT_SHA) \
-		--platform linux/x86_64,linux/arm64 \
-		--progress plain \
-			.
+		--progress=plain \
+		--tag grafana/vale:$(SHORT_SHA) \
+		--tag grafana/vale:latest \
+		.
 
 .PHONY: grafana/vale/push
 grafana/vale/push: ## Builds and pushes container image for Vale with the Grafana style loaded.
-grafana/vale/push: grafana/vale
-	podman manifest push localhost/grafana/vale:latest docker://docker.io/grafana/vale:latest
-	podman manifest push localhost/grafana/vale:$(SHORT_SHA) docker://docker.io/grafana/vale:$(SHORT_SHA)
-
+grafana/vale/push:
+	docker buildx build \
+		--platform linux/x86_64,linux/arm64 \
+		--progress=plain \
+		--push \
+		--tag grafana/vale:$(SHORT_SHA) \
+		--tag grafana/vale:latest \
+		.
 .PHONY: sync
 sync: ## Update the vendored Google style.
 sync: