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

fixed if statement in start script

Browse Source
This commit is contained in:
Ric Harvey
2017-02-07 11:37:11 +00:00
parent e6da096f0e
commit 869483e5a2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/start.sh
View File

@@ -5,6 +5,10 @@
mkdir -p -m 0700 /root/.ssh mkdir -p -m 0700 /root/.ssh
echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config echo -e "Host *\n\tStrictHostKeyChecking no\n" >> /root/.ssh/config
if [[ "$GIT_USE_SSH" == "1" ]] ; then
echo -e "Host *\n\tUser ${GIT_USERNAME}\n\n" >> /root/.ssh/config
fi
if [ ! -z "$SSH_KEY" ]; then if [ ! -z "$SSH_KEY" ]; then
echo $SSH_KEY > /root/.ssh/id_rsa.base64 echo $SSH_KEY > /root/.ssh/id_rsa.base64
base64 -d /root/.ssh/id_rsa.base64 > /root/.ssh/id_rsa base64 -d /root/.ssh/id_rsa.base64 > /root/.ssh/id_rsa
@@ -42,10 +46,11 @@ if [ ! -d "/var/www/html/.git" ]; then
if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then if [ -z "$GIT_USERNAME" ] && [ -z "$GIT_PERSONAL_TOKEN" ]; then
GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}" GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
else else
if [[ "$GIT_USE_SSH" == "1" ]]; then if [[ "$GIT_USE_SSH" == "1" ]]; then
GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}" GIT_COMMAND=${GIT_COMMAND}" ${GIT_REPO}"
else else
GIT_COMMAND=${GIT_COMMAND}" https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO}" GIT_COMMAND=${GIT_COMMAND}" https://${GIT_USERNAME}:${GIT_PERSONAL_TOKEN}@${GIT_REPO}"
fi
fi fi
${GIT_COMMAND} /var/www/html || exit 1 ${GIT_COMMAND} /var/www/html || exit 1
chown -Rf nginx.nginx /var/www/html chown -Rf nginx.nginx /var/www/html