From 00cb58eaf346ca8e8595c1bc50f99ec635db6725 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 14 Feb 2024 13:36:02 -0800 Subject: [PATCH] add customer specific hotfixes to 'registry.min.dev' (#19057) ``` REPO="registry.min.dev/" CRED_DIR=/media/builder/minio make docker-hotfix-push ``` --- Makefile | 8 ++++---- docs/hotfixes.md | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a9a3b7bcc..8a0f5c383 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,8 @@ GOARCH := $(shell go env GOARCH) GOOS := $(shell go env GOOS) VERSION ?= $(shell git describe --tags) -TAG ?= "quay.io/minio/minio:$(VERSION)" +REPO ?= quay.io/minio +TAG ?= $(REPO)/minio:$(VERSION) GOLANGCI_DIR = .bin/golangci/$(GOLANGCI_VERSION) GOLANGCI = $(GOLANGCI_DIR)/golangci-lint @@ -144,12 +145,11 @@ hotfix-vars: $(eval LDFLAGS := $(shell MINIO_RELEASE="RELEASE" MINIO_HOTFIX="hotfix.$(shell git rev-parse --short HEAD)" go run buildscripts/gen-ldflags.go $(shell git describe --tags --abbrev=0 | \ sed 's#RELEASE\.\([0-9]\+\)-\([0-9]\+\)-\([0-9]\+\)T\([0-9]\+\)-\([0-9]\+\)-\([0-9]\+\)Z#\1-\2-\3T\4:\5:\6Z#'))) $(eval VERSION := $(shell git describe --tags --abbrev=0).hotfix.$(shell git rev-parse --short HEAD)) - $(eval TAG := "minio/minio:$(VERSION)") hotfix: hotfix-vars clean install ## builds minio binary with hotfix tags - @wget -q -c https://github.com/minio/pkger/releases/download/v2.2.0/pkger_2.2.0_linux_amd64.deb + @wget -q -c https://github.com/minio/pkger/releases/download/v2.2.1/pkger_2.2.1_linux_amd64.deb @wget -q -c https://raw.githubusercontent.com/minio/minio-service/v1.0.1/linux-systemd/distributed/minio.service - @sudo apt install ./pkger_2.2.0_linux_amd64.deb --yes + @sudo apt install ./pkger_2.2.1_linux_amd64.deb --yes @mkdir -p minio-release/$(GOOS)-$(GOARCH)/archive @cp -af ./minio minio-release/$(GOOS)-$(GOARCH)/minio @cp -af ./minio minio-release/$(GOOS)-$(GOARCH)/minio.$(VERSION) diff --git a/docs/hotfixes.md b/docs/hotfixes.md index 8041923c1..96f4508fb 100644 --- a/docs/hotfixes.md +++ b/docs/hotfixes.md @@ -128,4 +128,10 @@ To add a hotfix tag to the binary version and embed the relevant `commit-id` fol λ CRED_DIR=/media/builder/minio make docker-hotfix-push ``` +#### Builds the hotfix container and pushes to registry.min.dev//minio + +``` +λ REPO="registry.min.dev/" CRED_DIR=/media/builder/minio make docker-hotfix-push +``` + Once this has been provided to the customer relevant binary will be uploaded from our *release server* securely, directly to