Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #696 from progrium/revert-657-CNAME_option

Browse Source 
Revert "Add CNAME option"
This commit is contained in:
Jose Diaz-Gonzalez
2014-09-29 23:46:51 -04:00
parent 4e9d797d45 db7e36e0ca
commit a69f63c98c
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dokku
View File

@@ -61,12 +61,6 @@ case "$1" in
oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
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
DOCKER_ARGS=$(: | pluginhook docker-args $APP)
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,10 +25,6 @@ EOF
SSL_DIRECTIVES=""
fi
if [[ -f "$DOKKU_ROOT/$APP/CNAME" ]]; then
hostname=$(< "$DOKKU_ROOT/$APP/CNAME" )
fi
# ssl based nginx.conf
if [[ -n "$SSL_INUSE" ]]; then
cat<<EOF > $DOKKU_ROOT/$APP/nginx.conf