github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #657 from arthurnn/CNAME_option

Browse Source 
Add CNAME option
This commit is contained in:
Jeff Lindsay
2014-08-19 16:28:43 -05:00
parent 07cdab6187 0cd1839ce8
commit 4e9d797d45
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dokku
View File

@@ -61,6 +61,12 @@ case "$1" in
oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER") oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
fi fi
# CNAME
CNAME=$(docker run -i $IMAGE /bin/bash -c "if [[ -f /app/CNAME ]];then cat /app/CNAME; fi")
if [[ -n "$CNAME" ]]; then
echo "$CNAME" > "$DOKKU_ROOT/$APP/CNAME"
fi
# start the app # start the app
DOCKER_ARGS=$(: | pluginhook docker-args $APP) DOCKER_ARGS=$(: | pluginhook docker-args $APP)
id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web") id=$(docker run -d -p 5000 -e PORT=5000 $DOCKER_ARGS $IMAGE /bin/bash -c "/start web")

4
plugins/nginx-vhosts/post-deploy
View File

@@ -25,6 +25,10 @@ EOF
SSL_DIRECTIVES="" SSL_DIRECTIVES=""
fi fi
if [[ -f "$DOKKU_ROOT/$APP/CNAME" ]]; then
hostname=$(< "$DOKKU_ROOT/$APP/CNAME" )
fi
# ssl based nginx.conf # ssl based nginx.conf
if [[ -n "$SSL_INUSE" ]]; then if [[ -n "$SSL_INUSE" ]]; then
cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf