@@ -13,7 +13,7 @@ GO_TEST_ARGS ?=
1313# files do not get in the way
1414GO_FILES =$(shell git ls-files --cached --others --exclude-standard | grep '\.go$$')
1515.PHONY : format
16- format :
16+ format :
1717 @echo " format => *.go"
1818 @$(GO_TOOL ) golangci-lint fmt $(GO_FILES )
1919 @echo " licenses => **"
@@ -54,24 +54,28 @@ endif
5454BOE_DATA_HOME ?= $(HOME ) /.local/share/boe
5555
5656# Labels for this plugin image.
57- NAME := $(shell grep "^name:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
58- VERSION := $(shell grep "^version:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
59- DESCRIPTION := $(shell grep "^description:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
60- TIMESTAMP := $(shell date -u +"% Y-% m-% dT% H:% M:% SZ")
61- COMMIT_SHA := $(shell git rev-parse HEAD 2>/dev/null || echo "unknown")
62- AUTHOR := $(shell grep "^author:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
63- COMPOSER_VERSION := $(VERSION )
64- LICENSE := Apache-2.0
57+ NAME := $(shell grep "^name:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
58+ VERSION := $(shell grep "^version:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
59+ DESCRIPTION := $(shell grep "^description:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
60+ TIMESTAMP := $(shell date -u +"% Y-% m-% dT% H:% M:% SZ")
61+ COMMIT_SHA := $(shell git rev-parse HEAD 2>/dev/null || echo "unknown")
62+ AUTHOR := $(shell grep "^author:" manifest.yaml | sed 's/[^:]* :[[:space:]]* //g' | tr -d '"')
63+ COMPOSER_VERSION := $(VERSION )
64+ LICENSE := Apache-2.0
65+ IMAGE_TAG ?= $(VERSION )
66+ IMAGE_NAME_SUFFIX ?=
6567
6668HUB := $(or $(BOE_REGISTRY ) ,$(OCI_REGISTRY ) /built-on-envoy)
67- IMAGE := $(HUB ) /$(NAME ) :$(VERSION )$(IMAGE_NONCE )
69+ IMAGE_NAME := $(NAME )$(IMAGE_NAME_SUFFIX )
70+ IMAGE := $(HUB ) /$(IMAGE_NAME ) :$(IMAGE_TAG )$(IMAGE_NONCE )
6871SOURCE := https://$(subst ghcr.io,github.com,$(HUB ) )
6972
7073# Option to build lite version of the loader.
7174ifeq ($(strip $(COMPOSER_LITE ) ) ,true)
7275 DESCRIPTION := Go plugin loader.
7376 COMPOSER_BUILD_TAG := -tags lite
74- IMAGE := $(HUB)/$(NAME)-lite:$(VERSION)$(IMAGE_NONCE)
77+ IMAGE_NAME := $(NAME)-lite$(IMAGE_NAME_SUFFIX)
78+ IMAGE := $(HUB)/$(IMAGE_NAME):$(IMAGE_TAG)$(IMAGE_NONCE)
7579endif
7680
7781OS := linux
0 commit comments