diff options
author | nachoparker <nacho@ownyourbits.com> | 2018-06-19 07:40:51 +0300 |
---|---|---|
committer | nachoparker <nacho@ownyourbits.com> | 2018-06-19 07:40:51 +0300 |
commit | 91a85ab8f4083039645cc29ca5f576da82d3f814 (patch) | |
tree | d734da5979409557f5e48b48ea16058f6b9bea41 /docker | |
parent | 9637502da7a4d845597322233412e47c5594d532 (diff) |
docker: build fixes (shutdown mysql, letsencrypt cert dir)
Diffstat (limited to 'docker')
-rw-r--r-- | docker/lamp/Dockerfile | 3 | ||||
-rw-r--r-- | docker/nextcloudpi/Dockerfile | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/docker/lamp/Dockerfile b/docker/lamp/Dockerfile index 0f7ae30e..9470a476 100644 --- a/docker/lamp/Dockerfile +++ b/docker/lamp/Dockerfile @@ -15,6 +15,9 @@ source /usr/local/etc/library.sh; \ set +x; \ install_script /usr/local/etc/lamp.sh; \ +# stop mysqld +mysqladmin -u root shutdown; \ + # mariaDB fixups (move database to /data-ro, which will be in a persistent volume) mkdir -p /data-ro /data; \ mv /var/lib/mysql /data-ro/database; \ diff --git a/docker/nextcloudpi/Dockerfile b/docker/nextcloudpi/Dockerfile index 5c6082a7..9f616cd7 100644 --- a/docker/nextcloudpi/Dockerfile +++ b/docker/nextcloudpi/Dockerfile @@ -25,11 +25,6 @@ set +x; \ cd /usr/local/etc/; \ install_script ncp.sh; \ -# stop mysqld and redis -mysqladmin -u root shutdown; \ -kill $( cat /run/redis/redis-server.pid ); \ -kill $( cat /run/crond.pid ); \ - # fix default paths sed -i 's|/media/USBdrive|/data/backups|' ncp-config.d/nc-backup.sh; \ |