random password provisioning on boot/startupv0.46.20

During bootup of a new docker image, the redis
password might not match the nextcloud configuration.
Hence, we automatically update the nextcloud configuration.

For the MariaDB password the same method is applied.

Additionaly identical files have been moved to docker-common
to simplify changes in the future

2 files changed, 1 insertions, 37 deletions

diff --git a/docker/lamp/010lamp b/docker/lamp/010lamp
deleted file mode 100755
index 9552d848..00000000
--- a/docker/lamp/010lamp
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-source /usr/local/etc/library.sh
-
-set -e
-
-[[ "$1" == "stop" ]] && {
-  echo "Stopping apache"
-  apachectl graceful-stop
-  echo "Stopping PHP-fpm"
-  killall php-fpm7.0
-  echo "Stopping mariaDB"
-  mysqladmin -u root shutdown
-  echo "LAMP cleanup complete"
-  exit 0
-}
-
-# MOVE CONFIGS TO PERSISTENT VOLUME
-persistent_cfg /etc/apache2
-
-echo "Starting PHP-fpm"
-php-fpm7.0 &
-
-echo "Starting Apache"
-/usr/sbin/apache2ctl start
-
-echo "Starting mariaDB"
-mysqld &
-
-# wait for mariadb
-while :; do
-  [[ -S /var/run/mysqld/mysqld.sock ]] && break
-  sleep 0.5
-done
-
-exit 0
diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile
index 86418ef4..6e937edb 100644
--- a/docker/lamp/Dockerfile
+++ b/docker/lamp/Dockerfile
@@ -33,7 +33,7 @@ rm -f /var/log/alternatives.log /var/log/apt/*; \
 rm /data/database/ib_logfile*; \
 rm /usr/local/etc/lamp.sh
 
-COPY docker/lamp/010lamp /etc/services-enabled.d/
+COPY docker-common/lamp/010lamp /etc/services-enabled.d/
 
 ENTRYPOINT ["/run-parts.sh"]