From 2b30ab9a23283d7c7d61c42531e301f1388b8bac Mon Sep 17 00:00:00 2001 From: netaskd Date: Tue, 3 Sep 2019 17:16:24 +0300 Subject: [PATCH] misc: add variable JITSI_REPO instead hardcoded jitsi --- Makefile | 2 +- base-java/Makefile | 2 +- base/Makefile | 2 +- etherpad/Makefile | 2 +- jicofo/Makefile | 2 +- jigasi/Makefile | 2 +- jvb/Makefile | 2 +- prosody/Makefile | 2 +- web/Makefile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 692b1b8..712283e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ all: build-all release: tag-all push-all build: - $(MAKE) BUILD_ARGS=$(BUILD_ARGS) JITSI_RELEASE=$(JITSI_RELEASE) -C $(JITSI_SERVICE) build + $(MAKE) BUILD_ARGS=$(BUILD_ARGS) JITSI_REPO=$(JITSI_REPO) JITSI_RELEASE=$(JITSI_RELEASE) -C $(JITSI_SERVICE) build tag: docker tag $(JITSI_REPO)/$(JITSI_SERVICE):latest $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD) diff --git a/base-java/Makefile b/base-java/Makefile index 2668737..d819a6f 100644 --- a/base-java/Makefile +++ b/base-java/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/base-java . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/base-java . .PHONY: build diff --git a/base/Makefile b/base/Makefile index c79af53..4754b51 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) --build-arg JITSI_RELEASE=$(JITSI_RELEASE) -t jitsi/base . + docker build $(BUILD_ARGS) --build-arg JITSI_RELEASE=$(JITSI_RELEASE) -t $(JITSI_REPO)/base . .PHONY: build diff --git a/etherpad/Makefile b/etherpad/Makefile index 06eb689..7db0bf9 100644 --- a/etherpad/Makefile +++ b/etherpad/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/etherpad . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/etherpad . .PHONY: build diff --git a/jicofo/Makefile b/jicofo/Makefile index 98e71ad..e2bbddf 100644 --- a/jicofo/Makefile +++ b/jicofo/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/jicofo . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jicofo . .PHONY: build diff --git a/jigasi/Makefile b/jigasi/Makefile index a3735ac..d362e53 100644 --- a/jigasi/Makefile +++ b/jigasi/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/jigasi . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jigasi . .PHONY: build diff --git a/jvb/Makefile b/jvb/Makefile index 12abd0e..5f3469d 100644 --- a/jvb/Makefile +++ b/jvb/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/jvb . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jvb . .PHONY: build diff --git a/prosody/Makefile b/prosody/Makefile index 47f7279..a7225ae 100644 --- a/prosody/Makefile +++ b/prosody/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/prosody . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/prosody . .PHONY: build diff --git a/web/Makefile b/web/Makefile index efd98e8..8b203e2 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,4 +1,4 @@ build: - docker build $(BUILD_ARGS) -t jitsi/web . + docker build $(BUILD_ARGS) -t $(JITSI_REPO)/web . .PHONY: build