SchultesDev/nginx-php-fpm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge in @royrico pull request into 7.1 code

Browse Source
This commit is contained in:
Ric Harvey
2017-02-07 10:36:43 +00:00
parent cfcf9f7fbc
commit 2ec8a51070
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/start.sh
View File

@@ -34,19 +34,20 @@ if [ ! -d "/var/www/html/.git" ]; then
if [ ! -z "$GIT_REPO" ]; then
# Remove the test index file
rm -Rf /var/www/html/*
GIT_COMMAND='git clone '
if [ ! -z "$GIT_BRANCH" ]; then
if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then
git clone -b $GIT_BRANCH $GIT_REPO /var/www/html/ || exit 1
else
git clone -b ${GIT_BRANCH} https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO} /var/www/html || exit 1
fi
else
if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then
git clone $GIT_REPO /var/www/html/ || exit 1
else
git clone https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO} /var/www/html || exit 1
fi
GIT_COMMAND=${GIT_COMMAND}" -b ${GIT_BRANCH}"
fi
if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then
GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
else
if [[ "$GIT_USE_SSH" == "1" ]]; then
GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
else
GIT_COMMAND=${GIT_COMMAND}" https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO}"
fi
${GIT_COMMAND} /var/www/html || exit 1
chown -Rf nginx.nginx /var/www/html
fi
fi