Browse Source

build: add ability to force rebuilds and select releases

Saúl Ibarra Corretgé 7 years ago
parent
commit
0e43efa17e
7 changed files with 19 additions and 12 deletions
  1. 13 6
      Makefile
  2. 1 1
      base-java/Makefile
  3. 1 1
      base/Makefile
  4. 1 1
      jicofo/Makefile
  5. 1 1
      jvb/Makefile
  6. 1 1
      prosody/Makefile
  7. 1 1
      web/Makefile

+ 13 - 6
Makefile

@@ -1,9 +1,16 @@
+FORCE_REBUILD ?= 0
+JITSI_RELEASE ?= "unstable"
+
+ifeq ($(FORCE_REBUILD), 1)
+  BUILD_ARGS = "--no-cache"
+endif
+
 build-all:
-	$(MAKE) -C base build
-	$(MAKE) -C base-java build
-	$(MAKE) -C web build
-	$(MAKE) -C prosody build
-	$(MAKE) -C jicofo build
-	$(MAKE) -C jvb build
+	BUILD_ARGS=$(BUILD_ARGS) JITSI_RELEASE=$(JITSI_RELEASE) $(MAKE) -C base build
+	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C base-java build
+	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C web build
+	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C prosody build
+	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C jicofo build
+	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C jvb build
 
 .PHONY: build-all

+ 1 - 1
base-java/Makefile

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

+ 1 - 1
base/Makefile

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

+ 1 - 1
jicofo/Makefile

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

+ 1 - 1
jvb/Makefile

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

+ 1 - 1
prosody/Makefile

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

+ 1 - 1
web/Makefile

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