adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop intermediate REGISTRY_PREFIX variable and use FULLY_QUALIFIED_IMAGE more consistently

Browse Source 
TODO: test this on docker hub
This commit is contained in:
Julien Viard de Galbert 2021-05-11 16:17:25 +02:00
parent 6301503095
commit e51a8c92cf
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -17,10 +17,7 @@ PROJECT := kilo
PKG := github.com/squat/$(PROJECT) PKG := github.com/squat/$(PROJECT)
REGISTRY ?= index.docker.io REGISTRY ?= index.docker.io
IMAGE ?= squat/$(PROJECT) IMAGE ?= squat/$(PROJECT)
ifneq ($(REGISTRY),index.docker.io) FULLY_QUALIFIED_IMAGE := $(REGISTRY)/$(IMAGE)
REGISTRY_PREFIX := $(REGISTRY)/
endif
FULLY_QUALIFIED_IMAGE := $(REGISTRY_PREFIX)$(IMAGE)
TAG := $(shell git describe --abbrev=0 --tags HEAD 2>/dev/null) TAG := $(shell git describe --abbrev=0 --tags HEAD 2>/dev/null)
COMMIT := $(shell git rev-parse HEAD) COMMIT := $(shell git rev-parse HEAD)
@ -247,7 +244,7 @@ container: .container-$(ARCH)-$(VERSION) container-name
@docker images -q $(IMAGE):$(ARCH)-$(VERSION) > $@ @docker images -q $(IMAGE):$(ARCH)-$(VERSION) > $@
container-latest: .container-$(ARCH)-$(VERSION) container-latest: .container-$(ARCH)-$(VERSION)
@docker tag $(IMAGE):$(ARCH)-$(VERSION) $(REGISTRY_PREFIX)$(IMAGE):$(ARCH)-latest @docker tag $(IMAGE):$(ARCH)-$(VERSION) $(FULLY_QUALIFIED_IMAGE):$(ARCH)-latest
@echo "container: $(IMAGE):$(ARCH)-latest" @echo "container: $(IMAGE):$(ARCH)-latest"
container-name: container-name:
@ -292,14 +289,14 @@ manifest-name:
push: .push-$(ARCH)-$(VERSION) push-name push: .push-$(ARCH)-$(VERSION) push-name
.push-$(ARCH)-$(VERSION): .container-$(ARCH)-$(VERSION) .push-$(ARCH)-$(VERSION): .container-$(ARCH)-$(VERSION)
ifneq ($(REGISTRY_PREFIX),) ifneq ($(REGISTRY),index.docker.io)
@docker tag $(IMAGE):$(ARCH)-$(VERSION) $(REGISTRY)/$(IMAGE):$(ARCH)-$(VERSION) @docker tag $(IMAGE):$(ARCH)-$(VERSION) $(FULLY_QUALIFIED_IMAGE):$(ARCH)-$(VERSION)
endif endif
@docker push $(REGISTRY)/$(IMAGE):$(ARCH)-$(VERSION) @docker push $(FULLY_QUALIFIED_IMAGE):$(ARCH)-$(VERSION)
@docker images -q $(IMAGE):$(ARCH)-$(VERSION) > $@ @docker images -q $(IMAGE):$(ARCH)-$(VERSION) > $@
push-latest: container-latest push-latest: container-latest
@docker push $(REGISTRY)/$(IMAGE):$(ARCH)-latest @docker push $(FULLY_QUALIFIED_IMAGE):$(ARCH)-latest
@echo "pushed: $(IMAGE):$(ARCH)-latest" @echo "pushed: $(IMAGE):$(ARCH)-latest"
push-name: push-name: