Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor docker entrypoint.sh to better handle missing generated values #5131

Draft
wants to merge 3 commits into
base: 1.0-develop
Choose a base branch
from
Draft

Refactor docker entrypoint.sh to better handle missing generated values #5131

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f99226a
Refactor key generation in docker entrypoint.sh
danny6167 Jun 24, 2024
c0c15c1
Merge branch 'pterodactyl:1.0-develop' into docker/entrypoint-hashids
danny6167 Jun 24, 2024
e3db9f8
Merge branch '1.0-develop' into docker/entrypoint-hashids
danny6167 Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 41 additions & 20 deletions .github/docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,50 @@ mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php
&& chmod 777 /var/log/panel/logs/ \
&& ln -s /app/storage/logs/ /var/log/panel/

## check for .env file and generate app keys if missing
if [ -f /app/var/.env ]; then
echo "external vars exist."
rm -rf /app/.env
ln -s /app/var/.env /app/
else
echo "external vars don't exist."
rm -rf /app/.env
# Check that user has mounted the /app/var directory
if [ ! -d /app/var ]; then
echo "You must mount the /app/var directory to the container."
exit 1
fi

# Check the .env file exists and make a blank one if needed
if [ ! -f /app/var/.env ]; then
echo "Creating .env file."
touch /app/var/.env
fi

## manually generate a key because key generate --force fails
if [ -z $APP_KEY ]; then
echo -e "Generating key."
APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
echo -e "Generated app key: $APP_KEY"
echo -e "APP_KEY=$APP_KEY" > /app/var/.env
else
echo -e "APP_KEY exists in environment, using that."
echo -e "APP_KEY=$APP_KEY" > /app/var/.env
fi
# Replace .env in container with our external .env file
rm -f /app/.env
ln -s /app/var/.env /app/


# Use a subshell to avoid polluting the global environment
(
# Load in any existing environment variables in the .env file
source /app/.env

# Check if APP_KEY is set
if [ -z "$APP_KEY" ]; then
echo "Generating APP_KEY"
echo "APP_KEY=" >> /app/.env
APP_ENVIRONMENT_ONLY=true php artisan key:generate
fi

# Check if HASHIDS_LENGTH is set
if [ -z "$HASHIDS_LENGTH" ]; then
echo "Defaulting HASHIDS_LENGTH to 8"
echo "HASHIDS_LENGTH=8" >> /app/.env
fi


# Check if HASHID_SALT is set
if [ -z "$HASHIDS_SALT" ]; then
echo "Generating HASHIDS_SALT"
HASHIDS_SALT=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 20 | head -n 1)
echo "HASHIDS_SALT=$HASHIDS_SALT" >> /app/.env
fi
)

ln -s /app/var/.env /app/
fi

echo "Checking if https is required."
if [ -f /etc/nginx/http.d/panel.conf ]; then
Expand Down
Loading