mirror
/
docker-jitsi-meet
mirror of https://github.com/jitsi/docker-jitsi-meet
2
0
Fork 0
Code Issues Releases Wiki Activity

Change: Drive image compilation with JITSI_IMAGE_VERSION

Browse Source
pull/1853/head
Berbe 5 months ago
parent 6063f42425
commit 04e0b95635
No known key found for this signature in database
GPG Key ID: F89B549DB8AE91B6
1 changed files with 6 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      Makefile

12
Makefile
Unescape View File

@ -1,6 +1,6 @@
FORCE_REBUILD ?= 0 FORCE_REBUILD ?= 0
JITSI_RELEASE ?= stable JITSI_RELEASE ?= stable
JITSI_BUILD ?= unstable JITSI_IMAGE_VERSION ?= unstable
JITSI_REPO ?= jitsi JITSI_REPO ?= jitsi
JITSI_SERVICES := base base-java web prosody jicofo jvb jigasi jibri 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_ARGS := \
--build-arg JITSI_REPO=$(JITSI_REPO) \ --build-arg JITSI_REPO=$(JITSI_REPO) \
--build-arg JITSI_RELEASE=$(JITSI_RELEASE) \ --build-arg JITSI_RELEASE=$(JITSI_RELEASE) \
--build-arg BASE_TAG=$(JITSI_BUILD) --build-arg BASE_TAG=$(JITSI_IMAGE_VERSION)
ifeq ($(FORCE_REBUILD), 1) ifeq ($(FORCE_REBUILD), 1)
BUILD_ARGS := $(BUILD_ARGS) --no-cache BUILD_ARGS := $(BUILD_ARGS) --no-cache
@ -26,7 +26,7 @@ buildx:
--progress=plain \ --progress=plain \
$(BUILD_ARGS) \ $(BUILD_ARGS) \
--pull --push \ --pull --push \
--tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) \ --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION) \
--tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_RELEASE) \ --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_RELEASE) \
$(JITSI_SERVICE) $(JITSI_SERVICE)
@ -37,17 +37,17 @@ build:
docker build \ docker build \
$(BUILD_ARGS) \ $(BUILD_ARGS) \
--progress plain \ --progress plain \
--tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) \ --tag $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION) \
$(JITSI_SERVICE) $(JITSI_SERVICE)
$(addprefix build_,$(JITSI_SERVICES)): $(addprefix build_,$(JITSI_SERVICES)):
$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build $(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build
tag: 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: push:
docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_IMAGE_VERSION)
%-all: %-all:
@$(foreach SERVICE, $(JITSI_SERVICES), $(MAKE) --no-print-directory JITSI_SERVICE=$(SERVICE) $(subst -all,;,$@)) @$(foreach SERVICE, $(JITSI_SERVICES), $(MAKE) --no-print-directory JITSI_SERVICE=$(SERVICE) $(subst -all,;,$@))

Write Preview
Loading…
Cancel
Save