Merge branch 'dev' into token-parameter-additions

Makefile

@@ -1,49 +1,33 @@
 FORCE_REBUILD ?= 0
-JITSI_RELEASE ?= "stable"
-JITSI_BUILD ?= "latest"
+JITSI_RELEASE ?= stable
+JITSI_BUILD ?= latest
+JITSI_REPO ?= jitsi
+JITSI_SERVICES ?= base base-java web prosody jicofo jvb jigasi
 
 ifeq ($(FORCE_REBUILD), 1)
   BUILD_ARGS = "--no-cache"
 endif
 
-build-all:
-	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
-	BUILD_ARGS=$(BUILD_ARGS) $(MAKE) -C jigasi build
-
-tag-all:
-	docker tag jitsi/base:latest jitsi/base:$(JITSI_BUILD)
-	docker tag jitsi/base-java:latest jitsi/base-java:$(JITSI_BUILD)
-	docker tag jitsi/web:latest jitsi/web:$(JITSI_BUILD)
-	docker tag jitsi/prosody:latest jitsi/prosody:$(JITSI_BUILD)
-	docker tag jitsi/jicofo:latest jitsi/jicofo:$(JITSI_BUILD)
-	docker tag jitsi/jvb:latest jitsi/jvb:$(JITSI_BUILD)
-	docker tag jitsi/jigasi:latest jitsi/jigasi:$(JITSI_BUILD)
-
-push-all:
-	docker push jitsi/base:latest
-	docker push jitsi/base-java:latest
-	docker push jitsi/web:latest
-	docker push jitsi/prosody:latest
-	docker push jitsi/jicofo:latest
-	docker push jitsi/jvb:latest
-	docker push jitsi/jigasi:latest
-	docker push jitsi/base:$(JITSI_BUILD)
-	docker push jitsi/base-java:$(JITSI_BUILD)
-	docker push jitsi/web:$(JITSI_BUILD)
-	docker push jitsi/prosody:$(JITSI_BUILD)
-	docker push jitsi/jicofo:$(JITSI_BUILD)
-	docker push jitsi/jvb:$(JITSI_BUILD)
-	docker push jitsi/jigasi:$(JITSI_BUILD)
 
+all:	build-all
+
+release: tag-all push-all
+
+build:
+	$(MAKE) BUILD_ARGS=$(BUILD_ARGS) JITSI_RELEASE=$(JITSI_RELEASE) -C $(JITSI_SERVICE) build
+
+tag:
+	docker tag jitsi/$(JITSI_SERVICE):latest $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
+
+push:
+	docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
+
+%-all:
+	@$(foreach SERVICE, $(JITSI_SERVICES), $(MAKE) --no-print-directory JITSI_SERVICE=$(SERVICE) $(subst -all,;,$@))
 
 clean:
 	docker-compose stop
 	docker-compose rm
 	docker network prune
 
-.PHONY: build-all tag-all push-all clean
+.PHONY: all build tag push clean

README.md

@@ -145,7 +145,9 @@ In order to do that, first execute a shell in the corresponding container:
 
 Once in the container, run the following command to create a user:
 
-``prosodyctl --config /config/prosody.cfg.lua register user meet.jitsi password``
+``prosodyctl --config /config/prosody.cfg.lua register username@meet.jitsi``
+
+The command then asks for a password interactively.
 
 #### Authentication using LDAP
 

base/Dockerfile

@@ -19,8 +19,14 @@ RUN \
 	echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/sources.list.d/backports.list && \
 	apt-dpkg-wrap apt-get update && \
 	apt-dpkg-wrap apt-get dist-upgrade -y && \
-	apt-dpkg-wrap apt-get autoremove -y --purge gnupg && \
 	apt-cleanup && \
 	chmod +x /usr/bin/frep
 
+RUN \
+	[[ "$JITSI_RELEASE" == "unstable" ]] && \
+	apt-dpkg-wrap apt-get update && \
+	apt-dpkg-wrap apt-get install -y jq procps curl vim iputils-ping net-tools && \
+	apt-cleanup || \
+	true
+
 ENTRYPOINT [ "/init" ]

jvb/rootfs/etc/cont-init.d/10-config

@@ -8,3 +8,4 @@ if [[ ! -f /config/logging.properties ]]; then
     cp /defaults/logging.properties /config
 fi
 
+chown -R jvb:jitsi /config

web/Dockerfile

@@ -12,5 +12,4 @@ COPY rootfs/ /
 
 EXPOSE 80 443
 
-VOLUME /config
-
+VOLUME ["/config", "/etc/letsencrypt"]