misc: add ARG JITSI_REPO for dependented dockerfiles

This commit is contained in:
netaskd 2019-09-03 18:39:24 +03:00 committed by Saúl Ibarra Corretgé
parent 2b30ab9a23
commit 8352559f50
7 changed files with 15 additions and 8 deletions

View File

@ -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)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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