From bb1d386ebcacbf50d11095a16166032f2992ee9a Mon Sep 17 00:00:00 2001 From: netaskd Date: Mon, 17 Jun 2019 19:42:47 +0300 Subject: [PATCH 1/7] jvb: set owner jvb rights for /config directory --- jvb/rootfs/etc/cont-init.d/10-config | 1 + 1 file changed, 1 insertion(+) diff --git a/jvb/rootfs/etc/cont-init.d/10-config b/jvb/rootfs/etc/cont-init.d/10-config index 8e7b0f4..aa9bb04 100644 --- a/jvb/rootfs/etc/cont-init.d/10-config +++ b/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 From 046145d95e9ca48c77aee60d6c47244b0a30685b Mon Sep 17 00:00:00 2001 From: netaskd Date: Mon, 17 Jun 2019 19:55:59 +0300 Subject: [PATCH 2/7] base: add testing tools if JITSI_RELEASE is unstable --- base/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index 2e00afa..1d8396d 100644 --- a/base/Dockerfile +++ b/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" ] From 85c79cfb2b7bcf60ce3e1cd7378984c3a846f331 Mon Sep 17 00:00:00 2001 From: arnuschky Date: Thu, 20 Jun 2019 21:02:06 +0200 Subject: [PATCH 3/7] doc: fix prosody create user command in README Fixes: https://github.com/jitsi/docker-jitsi-meet/issues/109 --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 63cbbd0..a48c8cc 100644 --- a/README.md +++ b/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 From f809afe7ed65332922f414bd1de9212e8aaa9039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 20 Jun 2019 21:08:57 +0200 Subject: [PATCH 4/7] prosody: fix enabling the token_verification module Fixes: https://github.com/jitsi/jitsi-meet/issues/4349 --- prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index a0fbe4f..839e9e7 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -77,7 +77,7 @@ Component "{{ .Env.XMPP_MUC_DOMAIN }}" "muc" {{ if .Env.XMPP_MUC_MODULES }} "{{ join "\";\n\"" (splitList "," .Env.XMPP_MUC_MODULES) }}"; {{ end }} - {{ if .Env.JWT_ENABLE_TOKEN_AUTH | default "0" | toBool }} + {{ if eq $AUTH_TYPE "jwt" }} "token_verification"; {{ end }} } From e8c8342848dd869d14d6c5f311dfda0f971813a8 Mon Sep 17 00:00:00 2001 From: netaskd Date: Mon, 17 Jun 2019 19:21:06 +0300 Subject: [PATCH 5/7] misc: refactoring Makefile --- Makefile | 54 ++++++++++++++++++------------------------------------ 1 file changed, 18 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index cacc72a..e87d3c2 100644 --- a/Makefile +++ b/Makefile @@ -1,49 +1,31 @@ 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 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 From abac343442ac7df06a760a6815d3d8652d938b28 Mon Sep 17 00:00:00 2001 From: netaskd Date: Mon, 24 Jun 2019 13:13:20 +0300 Subject: [PATCH 6/7] makefile: add release target. all target makes build all only --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e87d3c2..b085be4 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,9 @@ ifeq ($(FORCE_REBUILD), 1) endif -all: build-all tag-all push-all +all: build-all + +release: tag-all push-all build: $(MAKE) BUILD_ARGS=$(BUILD_ARGS) JITSI_RELEASE=$(JITSI_RELEASE) -C $(JITSI_SERVICE) build From e6eecce2af9dbf8693c7afc624bd0c8aebf43bab Mon Sep 17 00:00:00 2001 From: Matthias Herzog <37505324+kegato@users.noreply.github.com> Date: Mon, 8 Jul 2019 20:32:40 +0200 Subject: [PATCH 7/7] web: add letsencrypt volume --- web/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index 542792e..c9c4e67 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -12,5 +12,4 @@ COPY rootfs/ / EXPOSE 80 443 -VOLUME /config - +VOLUME ["/config", "/etc/letsencrypt"]