Browse Source

build: refactor Makefile

Use a single one with dynamically generated rules instead of individual
makefiles which are 99% boilerplate.
Saúl Ibarra Corretgé 4 years ago
parent
commit
43f678d
9 changed files with 6 additions and 35 deletions
  1. 6 3
      Makefile
  2. 0 4
      base-java/Makefile
  3. 0 4
      base/Makefile
  4. 0 4
      jibri/Makefile
  5. 0 4
      jicofo/Makefile
  6. 0 4
      jigasi/Makefile
  7. 0 4
      jvb/Makefile
  8. 0 4
      prosody/Makefile
  9. 0 4
      web/Makefile

+ 6 - 3
Makefile

@@ -4,7 +4,7 @@ JITSI_BUILD ?= latest
 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
 
 
-BUILD_ARGS := --build-arg JITSI_REPO=$(JITSI_REPO)
+BUILD_ARGS := --build-arg JITSI_REPO=$(JITSI_REPO) --build-arg JITSI_RELEASE=$(JITSI_RELEASE)
 ifeq ($(FORCE_REBUILD), 1)
 ifeq ($(FORCE_REBUILD), 1)
   BUILD_ARGS := $(BUILD_ARGS) --no-cache
   BUILD_ARGS := $(BUILD_ARGS) --no-cache
 endif
 endif
@@ -15,7 +15,10 @@ all:	build-all
 release: tag-all push-all
 release: tag-all push-all
 
 
 build:
 build:
-	$(MAKE) BUILD_ARGS="$(BUILD_ARGS)" JITSI_REPO="$(JITSI_REPO)" JITSI_RELEASE="$(JITSI_RELEASE)" -C $(JITSI_SERVICE) build
+	docker build $(BUILD_ARGS) --progress plain --tag $(JITSI_REPO)/$(JITSI_SERVICE) $(JITSI_SERVICE)/
+
+$(addprefix build_,$(JITSI_SERVICES)):
+	$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build
 
 
 tag:
 tag:
 	docker tag $(JITSI_REPO)/$(JITSI_SERVICE):latest $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
 	docker tag $(JITSI_REPO)/$(JITSI_SERVICE):latest $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
@@ -36,4 +39,4 @@ prepare:
 	docker pull debian:buster-slim
 	docker pull debian:buster-slim
 	FORCE_REBUILD=1 $(MAKE)
 	FORCE_REBUILD=1 $(MAKE)
 
 
-.PHONY: all build tag push clean prepare release
+.PHONY: all build tag push clean prepare release $(addprefix build_,$(JITSI_SERVICES))

+ 0 - 4
base-java/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/base-java .
-
-.PHONY: build

+ 0 - 4
base/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) --build-arg JITSI_RELEASE=$(JITSI_RELEASE) -t $(JITSI_REPO)/base .
-
-.PHONY: build

+ 0 - 4
jibri/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jibri .
-
-.PHONY: build

+ 0 - 4
jicofo/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jicofo .
-
-.PHONY: build

+ 0 - 4
jigasi/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jigasi .
-
-.PHONY: build

+ 0 - 4
jvb/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/jvb .
-
-.PHONY: build

+ 0 - 4
prosody/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/prosody .
-
-.PHONY: build

+ 0 - 4
web/Makefile

@@ -1,4 +0,0 @@
-build:
-	docker build $(BUILD_ARGS) -t $(JITSI_REPO)/web .
-
-.PHONY: build