Fix Ubuntu install: skip Docker if present, wait for apt lock
This commit is contained in:
@@ -11,12 +11,16 @@ fi
|
||||
|
||||
bash scripts/install-ubuntu.sh
|
||||
|
||||
REAL_USER="${SUDO_USER:-ubuntu}"
|
||||
if id "${REAL_USER}" &>/dev/null; then
|
||||
sudo -u "${REAL_USER}" bash scripts/deploy.sh
|
||||
# root может запускать docker напрямую; обычный пользователь — через sudo -u
|
||||
if [[ -n "${SUDO_USER:-}" ]] && [[ "${SUDO_USER}" != "root" ]] && id "${SUDO_USER}" &>/dev/null; then
|
||||
sudo -u "${SUDO_USER}" bash scripts/deploy.sh
|
||||
else
|
||||
bash scripts/deploy.sh
|
||||
fi
|
||||
|
||||
IP=$(hostname -I | awk '{print $1}')
|
||||
echo ""
|
||||
echo "Готово! Откройте http://$(hostname -I | awk '{print $1}')"
|
||||
echo "Готово!"
|
||||
echo " Магазин: http://${IP}"
|
||||
echo " Админка: http://${IP}/admin/login"
|
||||
echo " Пароль: grep ADMIN_PASSWORD .env"
|
||||
|
||||
Reference in New Issue
Block a user