Cleaned up a few docker configs

lib/element.sh

@@ -5,15 +5,13 @@
 PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 config_element() {
-  echo -ne "\n* Configuring /federated/apps/element container.."
+  echo -ne "* Configuring element container.."
 
   if [ ! -d "/federated/apps/element" ]; then
     mkdir -p /federated/apps/element/data/element &> /dev/null
   fi
 
 cat > /federated/apps/element/docker-compose.yml <<EOF
-version: '3.7'
-
 services:
   element:
     image: vectorim/element-web:\${IMAGE_VERSION}
@@ -122,11 +120,11 @@ cat > /federated/apps/element/data/element/element-config.json <<EOF
 }
 EOF
 
-echo -ne "done."
+echo -ne "done.\n"
 }
 start_element() {
   # Start service with command to make sure it's up before proceeding
   start_service "element" "nc -z 192.168.0.20 80 &> /dev/null" "7"
 
-  echo -ne "done."
+  echo -ne "done.\n"
 }

lib/ldap.sh

@@ -5,7 +5,7 @@
 PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 config_ldap() {
-  echo -ne "\n* Configuring /federated/apps/ldap container.."
+  echo -ne "* Configuring ldap container.."
 
   if [ ! -d "/federated/apps/ldap" ]; then
     mkdir -p /federated/apps/ldap/data/certs &> /dev/null
@@ -19,8 +19,6 @@ config_ldap() {
   LDAPFCOREPASS=`echo -n $ADMINPASS | openssl dgst -sha1 -binary | openssl enc -base64 | awk '{print "{SHA}"$0}'`
 
 cat > /federated/apps/ldap/docker-compose.yml <<EOF
-version: '3.7'
-
 services:
   ldap:
     image: osixia/openldap:\${IMAGE_VERSION}
@@ -175,7 +173,7 @@ EOF
 
 chmod +x /federated/apps/ldap/data/root/ldap.sh
 
-echo -ne "done."
+echo -ne "done.\n"
 }
 start_ldap() {
   # Start service with command to make sure it's up before proceeding
@@ -186,5 +184,5 @@ start_ldap() {
   docker exec ldap /root/ldap.sh &> /dev/null
   [ $? -ne 0 ] && fail "Couldn't run ldap.sh inside ldap container"
 
-  echo -ne "done."
+  echo -ne "done.\n"
 }

lib/nextcloud.sh

@@ -19,8 +19,6 @@ config_nextcloud() {
   get_appvars
 
 cat > /federated/apps/nextcloud/docker-compose.yml <<EOF
-version: '3.7'
-
 services:
   nextcloud:
     image: nextcloud:\${IMAGE_VERSION}

lib/panel.sh

@@ -5,15 +5,13 @@
 PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 config_panel() {
-  echo -ne "\n* Configuring /federated/apps/panel container.."
+  echo -ne "* Configuring panel container.."
 
   if [ ! -d "/federated/apps/panel" ]; then
     mkdir -p /federated/apps/panel/data/opt/ldap_user_manager
   fi
 
 cat > /federated/apps/panel/docker-compose.yml <<EOF
-version: '3.7'
-
 services:
   panel:
     image: wheelybird/ldap-user-manager:\${IMAGE_VERSION}
@@ -71,11 +69,11 @@ NO_HTTPS=true
 EOF
 chmod 600 /federated/apps/panel/.env
  
-echo -ne "done."
+echo -ne "done.\n"
 }
 start_panel() {
   # Start service with command to make sure it's up before proceeding
   start_service "panel" "nc -z 192.168.0.23 80 &> /dev/null" "7"
 
-  echo -ne "done."
+  echo -ne "done.\n"
 }

lib/pdnsadmin.sh

@@ -5,15 +5,13 @@
 PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 config_pdnsadmin() {
-  echo -ne "\n* Configuring /federated/apps/pdnsadmin container.."
+  echo -ne "* Configuring pdnsadmin container.."
 
   if [ ! -d "/federated/apps/pdnsadmin" ]; then
     mkdir -p /federated/apps/pdnsadmin/data/etc
   fi
 
 cat > /federated/apps/pdnsadmin/docker-compose.yml <<EOF
-version: '3.7'
-
 services:
   pdnsadmin:
     image: pschiffe/pdns-admin-uwsgi\${IMAGE_VERSION}
@@ -86,7 +84,7 @@ pidfile = /run/uwsgi/%n.pid
 enable-threads = true
 EOF
  
-echo -ne "done."
+echo -ne "done.\n"
 }
 start_pdnsadmin() {
   # Start service with command to make sure it's up before proceeding
@@ -95,5 +93,5 @@ start_pdnsadmin() {
   # Run MySQL command to create admin user for pdns admin interface
   docker exec pdnsmysql bash -c "mysql -updns -p$MYSQL_PASSWORD pdns -e '$PDNS_MYSQL_COMMAND;'"
 
-  echo -ne "done."
+  echo -ne "done.\n"
 }

lib/pdnsmysql.sh

@@ -5,15 +5,13 @@
 PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 config_pdnsmysql() {
-  echo -ne "\n* Configuring /federated/apps/pdnsmysql container.."
+  echo -ne "* Configuring pdnsmysql container.."
 
   if [ ! -d "/federated/apps/pdnsmysql" ]; then
     mkdir -p /federated/apps/pdnsmysql/data/var/lib/mysql
   fi
 
 cat > /federated/apps/pdnsmysql/docker-compose.yml <<EOF
-version: '3.7'
-
 services:
   mysql:
     image: mariadb:\${IMAGE_VERSION}
@@ -45,11 +43,11 @@ MYSQL_USER=pdns
 EOF
 chmod 600 /federated/apps/pdnsmysql/.env
  
-echo -ne "done."
+echo -ne "done.\n"
 }
 start_pdnsmysql() {
   # Start service with command to make sure it's up before proceeding
   start_service "pdnsmysql" "nc -z 192.168.0.10 3306 &> /dev/null" "8"
 
-  echo -ne "done."
+  echo -ne "done.\n"
 }

lib/roundcube.sh

@@ -13,7 +13,6 @@ config_roundcube() {
   fi
 
 cat > /federated/apps/roundcube/docker-compose.yml <<EOF
-version: "3.7"
 services:
   roundcube:
     image: roundcube/roundcubemail:\${IMAGE_VERSION}