Browse Source

misc: add ARG JITSI_REPO for dependented dockerfiles

netaskd 5 years ago
parent
commit
8352559f50
7 changed files with 15 additions and 8 deletions
  1. 3 2
      Makefile
  2. 2 1
      base-java/Dockerfile
  3. 2 1
      jicofo/Dockerfile
  4. 2 1
      jigasi/Dockerfile
  5. 2 1
      jvb/Dockerfile
  6. 2 1
      prosody/Dockerfile
  7. 2 1
      web/Dockerfile

+ 3 - 2
Makefile

@@ -4,8 +4,9 @@ JITSI_BUILD ?= latest
 JITSI_REPO ?= jitsi
 JITSI_SERVICES ?= base base-java web prosody jicofo jvb jigasi etherpad
 
+BUILD_ARGS := --build-arg JITSI_REPO=$(JITSI_REPO)
 ifeq ($(FORCE_REBUILD), 1)
-  BUILD_ARGS = "--no-cache"
+  BUILD_ARGS := $(BUILD_ARGS) --no-cache
 endif
 
 
@@ -14,7 +15,7 @@ all:	build-all
 release: tag-all push-all
 
 build:
-	$(MAKE) BUILD_ARGS=$(BUILD_ARGS) JITSI_REPO=$(JITSI_REPO) 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)

+ 2 - 1
base-java/Dockerfile

@@ -1,4 +1,5 @@
-FROM jitsi/base
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base
 
 RUN	\
 	mkdir -p /usr/share/man/man1 && \

+ 2 - 1
jicofo/Dockerfile

@@ -1,4 +1,5 @@
-FROM jitsi/base-java
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base-java
 
 RUN \
 	apt-dpkg-wrap apt-get update && \

+ 2 - 1
jigasi/Dockerfile

@@ -1,4 +1,5 @@
-FROM jitsi/base-java
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base-java
 
 RUN \
 	apt-dpkg-wrap apt-get update && \

+ 2 - 1
jvb/Dockerfile

@@ -1,4 +1,5 @@
-FROM jitsi/base-java
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base-java
 
 RUN \
 	apt-dpkg-wrap apt-get update && \

+ 2 - 1
prosody/Dockerfile

@@ -1,4 +1,5 @@
-FROM jitsi/base
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base
 
 RUN \
     apt-dpkg-wrap apt-get update \

+ 2 - 1
web/Dockerfile

@@ -1,4 +1,5 @@
-FROM jitsi/base
+ARG JITSI_REPO=jitsi
+FROM ${JITSI_REPO}/base
 
 RUN \
 	apt-dpkg-wrap apt-get update && \