From 04e0b956354d8121c534b8bf133a85245d8fe856 Mon Sep 17 00:00:00 2001 From: Berbe <4251220+Berbe@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:05:38 +0200 Subject: [PATCH] Change: Drive image compilation with JITSI_IMAGE_VERSION --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b90fdef..d0115c0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ FORCE_REBUILD ?= 0 JITSI_RELEASE ?= stable -JITSI_BUILD ?= unstable +JITSI_IMAGE_VERSION ?= unstable JITSI_REPO ?= jitsi JITSI_SERVICES := base base-java web prosody jicofo jvb jigasi jibri @@ -8,7 +8,7 @@ JITSI_SERVICES := base base-java web prosody jicofo jvb jigasi jibri BUILD_ARGS := \ --build-arg JITSI_REPO=$(JITSI_REPO) \ --build-arg JITSI_RELEASE=$(JITSI_RELEASE) \ - --build-arg BASE_TAG=$(JITSI_BUILD) + --build-arg BASE_TAG=$(JITSI_IMAGE_VERSION) ifeq ($(FORCE_REBUILD), 1) BUILD_ARGS := $(BUILD_ARGS) --no-cache @@ -26,7 +26,7 @@ buildx: --progress=plain \ $(BUILD_ARGS) \ --pull --push \ - --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) \ + --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION) \ --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_RELEASE) \ $(JITSI_SERVICE) @@ -37,17 +37,17 @@ build: docker build \ $(BUILD_ARGS) \ --progress plain \ - --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) \ + --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION) \ $(JITSI_SERVICE) $(addprefix build_,$(JITSI_SERVICES)): $(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build tag: - docker tag $(JITSI_REPO)/$(JITSI_SERVICE) $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) + docker tag $(JITSI_REPO)/$(JITSI_SERVICE) $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION) push: - docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) + docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION) %-all: @$(foreach SERVICE, $(JITSI_SERVICES), $(MAKE) --no-print-directory JITSI_SERVICE=$(SERVICE) $(subst -all,;,$@))