From b17290f3be41b5997f08252bcd8fd5fd3d031a8d Mon Sep 17 00:00:00 2001 From: ahg-g Date: Sat, 21 Dec 2024 00:17:59 +0000 Subject: [PATCH] Fixing the build command --- Dockerfile | 2 +- Makefile | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef32d0e9..e8ac62c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ## Multistage build -FROM golang:1.23-alpine as build +FROM golang:1.23-alpine AS build ENV CGO_ENABLED=0 ENV GOOS=linux ENV GOARCH=amd64 diff --git a/Makefile b/Makefile index 74bb958e..8879a6b1 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ SHELL = /usr/bin/env bash -o pipefail .SHELLFLAGS = -ec GIT_TAG ?= $(shell git describe --tags --dirty --always) -PLATFORMS ?= linux/amd64,linux/arm64 +PLATFORMS ?= linux/amd64 DOCKER_BUILDX_CMD ?= docker buildx IMAGE_BUILD_CMD ?= $(DOCKER_BUILDX_CMD) build IMAGE_BUILD_EXTRA_OPTS ?= @@ -36,6 +36,13 @@ IMAGE_TAG ?= $(IMAGE_REPO):$(GIT_TAG) BASE_IMAGE ?= gcr.io/distroless/static:nonroot BUILDER_IMAGE ?= golang:$(GO_VERSION) +ifdef EXTRA_TAG +IMAGE_EXTRA_TAG ?= $(IMAGE_REPO):$(EXTRA_TAG) +endif +ifdef IMAGE_EXTRA_TAG +IMAGE_BUILD_EXTRA_OPTS += -t $(IMAGE_EXTRA_TAG) +endif + ##@ General # The help target prints out all targets with their descriptions organized