D2942.1775156280.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D2942.1775156280.diff
View Options

	diff --git a/bin/quickstart.sh b/bin/quickstart.sh
	--- a/bin/quickstart.sh
	+++ b/bin/quickstart.sh
	@@ -34,12 +34,11 @@
	test ! -z "$(php --modules \| grep swoole)" \|\| \
	die "Is swoole installed?"

	-base_dir=$(dirname $(dirname $0))
	-
	-docker pull docker.io/kolab/centos7:latest
	+# Use 'grubby --update-kernel=ALL --args="systemd.unified_cgroup_hierarchy=0"' to fix
	+$(cat /proc/cmdline \| grep "systemd.unified_cgroup_hierarchy=0") && \
	+ die "systemd containers only work with cgroupv1 (use 'grubby ')"

	-docker-compose down --remove-orphans
	-docker-compose build
	+base_dir=$(dirname $(dirname $0))

	pushd ${base_dir}/src/

	@@ -54,6 +53,11 @@

	popd

	+docker pull docker.io/kolab/centos7:latest
	+
	+docker-compose down --remove-orphans
	+docker-compose build coturn kolab mariadb meet pdns-sql proxy redis
	+
	bin/regen-certs

	docker-compose up -d coturn kolab mariadb meet pdns-sql proxy redis
	@@ -68,8 +72,6 @@
	./artisan clear-compiled
	./artisan cache:clear
	./artisan horizon:install
	-./artisan passport:keys --force
	-

	if [ ! -f storage/oauth-public.key -o ! -f storage/oauth-private.key ]; then
	./artisan passport:keys --force
	@@ -81,7 +83,7 @@
	EOF


	-if [ ! -z "$(rpm -qv chromium 2>/dev/null)" ]; then
	+if rpm -qv chromium 2>/dev/null; then
	chver=$(rpmquery --queryformat="%{VERSION}" chromium \| awk -F'.' '{print $1}')
	./artisan dusk:chrome-driver ${chver}
	fi