Skip to content

Commit 0b42115

Browse files
committed
feat: add root user details to install script
1 parent 54eb4e3 commit 0b42115

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

other/nightly/install.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -o pipefail # Cause a pipeline to return the status of the last command that
88
CDN="https://cdn.coollabs.io/coolify"
99
DATE=$(date +"%Y%m%d-%H%M%S")
1010

11-
VERSION="1.6"
11+
VERSION="1.7"
1212
DOCKER_VERSION="27.0"
1313
# TODO: Ask for a user
1414
CURRENT_USER=$USER
@@ -488,13 +488,13 @@ fi
488488

489489
# Add default root user credentials from environment variables
490490
if [ -n "$ROOT_USERNAME" ] && [ -n "$ROOT_USER_EMAIL" ] && [ -n "$ROOT_USER_PASSWORD" ]; then
491-
if ! grep -q "^ROOT_USERNAME=" "$ENV_FILE-$DATE"; then
491+
if grep -q "^ROOT_USERNAME=" "$ENV_FILE-$DATE"; then
492492
sed -i "s|^ROOT_USERNAME=.*|ROOT_USERNAME=$ROOT_USERNAME|" "$ENV_FILE-$DATE"
493493
fi
494-
if ! grep -q "^ROOT_USER_EMAIL=" "$ENV_FILE-$DATE"; then
494+
if grep -q "^ROOT_USER_EMAIL=" "$ENV_FILE-$DATE"; then
495495
sed -i "s|^ROOT_USER_EMAIL=.*|ROOT_USER_EMAIL=$ROOT_USER_EMAIL|" "$ENV_FILE-$DATE"
496496
fi
497-
if ! grep -q "^ROOT_USER_PASSWORD=" "$ENV_FILE-$DATE"; then
497+
if grep -q "^ROOT_USER_PASSWORD=" "$ENV_FILE-$DATE"; then
498498
sed -i "s|^ROOT_USER_PASSWORD=.*|ROOT_USER_PASSWORD=$ROOT_USER_PASSWORD|" "$ENV_FILE-$DATE"
499499
fi
500500
fi

scripts/install.sh

+19-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -o pipefail # Cause a pipeline to return the status of the last command that
88
CDN="https://cdn.coollabs.io/coolify"
99
DATE=$(date +"%Y%m%d-%H%M%S")
1010

11-
VERSION="1.6"
11+
VERSION="1.7"
1212
DOCKER_VERSION="27.0"
1313
# TODO: Ask for a user
1414
CURRENT_USER=$USER
@@ -22,6 +22,11 @@ echo -e "Welcome to Coolify Installer!"
2222
echo -e "This script will install everything for you. Sit back and relax."
2323
echo -e "Source code: https://github.com/coollabsio/coolify/blob/main/scripts/install.sh\n"
2424

25+
# Predefined root user
26+
ROOT_USERNAME=${ROOT_USERNAME:-}
27+
ROOT_USER_EMAIL=${ROOT_USER_EMAIL:-}
28+
ROOT_USER_PASSWORD=${ROOT_USER_PASSWORD:-}
29+
2530
TOTAL_SPACE=$(df -BG / | awk 'NR==2 {print $2}' | sed 's/G//')
2631
AVAILABLE_SPACE=$(df -BG / | awk 'NR==2 {print $4}' | sed 's/G//')
2732
REQUIRED_TOTAL_SPACE=30
@@ -481,6 +486,19 @@ else
481486
sed -i "s|^PUSHER_APP_SECRET=.*|PUSHER_APP_SECRET=$(openssl rand -hex 32)|" "$ENV_FILE-$DATE"
482487
fi
483488

489+
# Add default root user credentials from environment variables
490+
if [ -n "$ROOT_USERNAME" ] && [ -n "$ROOT_USER_EMAIL" ] && [ -n "$ROOT_USER_PASSWORD" ]; then
491+
if grep -q "^ROOT_USERNAME=" "$ENV_FILE-$DATE"; then
492+
sed -i "s|^ROOT_USERNAME=.*|ROOT_USERNAME=$ROOT_USERNAME|" "$ENV_FILE-$DATE"
493+
fi
494+
if grep -q "^ROOT_USER_EMAIL=" "$ENV_FILE-$DATE"; then
495+
sed -i "s|^ROOT_USER_EMAIL=.*|ROOT_USER_EMAIL=$ROOT_USER_EMAIL|" "$ENV_FILE-$DATE"
496+
fi
497+
if grep -q "^ROOT_USER_PASSWORD=" "$ENV_FILE-$DATE"; then
498+
sed -i "s|^ROOT_USER_PASSWORD=.*|ROOT_USER_PASSWORD=$ROOT_USER_PASSWORD|" "$ENV_FILE-$DATE"
499+
fi
500+
fi
501+
484502
# Merge .env and .env.production. New values will be added to .env
485503
echo -e "7. Propagating .env with new values - if necessary."
486504
awk -F '=' '!seen[$1]++' "$ENV_FILE-$DATE" /data/coolify/source/.env.production > $ENV_FILE

0 commit comments

Comments
 (0)