flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-11 16:32:59 +00:00
Code Issues Releases Wiki Activity

Mount /var/lib/dbus/machine-id from /etc/machine-id

Browse Source 
Fixes https://github.com/zokradonh/kopano-docker/issues/371

Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
Felix Bartels
2020-03-27 14:54:51 +01:00
parent 864459d745
commit 97ebd264d6
6 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/kopano-multiserver/kopano-multiserver.yml
+1 -1
View File
@@ -57,7 +57,7 @@ services:
- web-net
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
- kopanodata2/:/kopano/data
- kopanosocket2/:/run/kopano
- kopanossl/:/kopano/ssl
examples/meet/docker-compose.yml
+7 -7
View File
@@ -22,7 +22,7 @@ services:
- SETUID
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
- web:/.kweb
networks:
web-net:
@@ -61,7 +61,7 @@ services:
command: serve
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id\
- /etc/machine-id:/var/lib/dbus/machine-id\
- kopanolicenses:/etc/kopano/licenses
- kopanosocket/:/run/kopano
@@ -71,7 +71,7 @@ services:
container_name: ${COMPOSE_PROJECT_NAME}_grapi
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
- kopanosocket/:/run/kopano
environment:
- GRAPI_BACKEND=ldap
@@ -93,7 +93,7 @@ services:
- kopano_grapi
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
- kopanodata/:/kopano/data
- kopanosocket/:/run/kopano
- kopanossl/:/kopano/ssl
@@ -115,7 +115,7 @@ services:
- web
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
- kopanossl/:/kopano/ssl
environment:
- allow_client_guests=yes
@@ -161,7 +161,7 @@ services:
- turn_service_credentials_user=${TURN_USER}
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
- kopanossl/:/kopano/ssl
networks:
- web-net
@@ -182,7 +182,7 @@ services:
- web
volumes:
- /etc/machine-id:/etc/machine-id
- /var/lib/dbus/machine-id:/var/lib/dbus/machine-id
- /etc/machine-id:/var/lib/dbus/machine-id
networks:
- web-net
examples/meet/setup.sh
+5
View File
@@ -10,6 +10,11 @@ random_string() {
hexdump -n 16 -v -e '/1 "%02X"' /dev/urandom
}
if [ ! -e /etc/machine-id ]; then
echo "This compose file uses /etc/machine-id to identify the system its running on. The file does not seem to exist on your system, please create it."
exit 1
fi
if [ ! -e ./.env ]; then
PRINT_SETUP_SUCCESS=""