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 /etc | |
| parent | 9637502da7a4d845597322233412e47c5594d532 (diff) | |
docker: build fixes (shutdown mysql, letsencrypt cert dir)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ncp-config.d/letsencrypt.sh | 1 | ||||
| -rw-r--r-- | etc/ncp-config.d/nc-init.sh | 13 |
2 files changed, 6 insertions, 8 deletions
diff --git a/etc/ncp-config.d/letsencrypt.sh b/etc/ncp-config.d/letsencrypt.sh index b736d25b..753a0877 100644 --- a/etc/ncp-config.d/letsencrypt.sh +++ b/etc/ncp-config.d/letsencrypt.sh @@ -32,6 +32,7 @@ install() cd /etc || return 1 apt-get update apt-get install --no-install-recommends -y letsencrypt + mkdir -p /etc/letsencrypt/live [[ "$DOCKERBUILD" == 1 ]] && { # execute before lamp stack diff --git a/etc/ncp-config.d/nc-init.sh b/etc/ncp-config.d/nc-init.sh index d1ebdaf0..c247a88b 100644 --- a/etc/ncp-config.d/nc-init.sh +++ b/etc/ncp-config.d/nc-init.sh @@ -37,16 +37,13 @@ configure() mysqld & fi + # wait for mariadb pgrep -x mysqld &>/dev/null || { echo "mariaDB process not found. Waiting..." - - # wait for mariadb - # TODO FIXME armbian build - #while :; do - #[[ -S /run/mysqld/mysqld.sock ]] && break - #sleep 0.5 - #done - sleep 10 + while :; do + [[ -S /run/mysqld/mysqld.sock ]] && break + sleep 0.5 + done } # workaround to emulate DROP USER IF EXISTS ..;) |