Revert "Add CNAME option"

This commit is contained in:
Jose Diaz-Gonzalez committed 2014-09-29 23:44:23 -04:00
1 parent 4e9d797d45
commit db7e36e0ca
2 files changed
-10

No files matched your search

-6
View File
@@ -61,12 +61,6 @@ 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
View File
@@ -25,10 +25,6 @@ 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