diff --git a/README.md b/README.md index a05d650..645fa16 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,7 @@ DOKKU_MYSQL_LOLLIPOP_PORT_3306_TCP_ADDR=172.17.0.1 The following will be set on the linked application by default: ``` -DATABASE_URL=mysql://lollipop:SOME_PASSWORD@dokku-mysql-lollipop:3306/lollipop +DATABASE_URL=mysql://mysql:SOME_PASSWORD@dokku-mysql-lollipop:3306/lollipop ``` The host exposed here only works internally in docker containers. If you want your container to be reachable from outside, you should use the `expose` subcommand. Another service can be linked to your app: @@ -243,13 +243,7 @@ dokku mysql:link lollipop playground This will cause `DATABASE_URL` to be set as: ``` -mysql2://lollipop:SOME_PASSWORD@dokku-mysql-lollipop:3306/lollipop -``` - -If you specify `MYSQL_DATABASE_SCHEME` to equal `http`, we`ll also automatically adjust `DATABASE_URL` to match the http interface: - -``` -http://lollipop:SOME_PASSWORD@dokku-mysql-lollipop:${PLUGIN_DATASTORE_PORTS[1]} +mysql2://mysql:SOME_PASSWORD@dokku-mysql-lollipop:3306/lollipop ``` ### unlink the mysql service from the app diff --git a/subcommands/link b/subcommands/link index f59f82a..fafd174 100755 --- a/subcommands/link +++ b/subcommands/link @@ -23,7 +23,7 @@ service-link-cmd() { #E #E the following will be set on the linked application by default: #E - #E ${PLUGIN_DEFAULT_ALIAS}_URL=${PLUGIN_SCHEME}://lollipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop + #E ${PLUGIN_DEFAULT_ALIAS}_URL=${PLUGIN_SCHEME}://mysql:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop #E #E the host exposed here only works internally in docker containers. #E if you want your container to be reachable from outside, you should @@ -37,11 +37,7 @@ service-link-cmd() { #E dokku $PLUGIN_COMMAND_PREFIX:link lollipop playground #E this will cause ${PLUGIN_DEFAULT_ALIAS}_URL to be set as: #E - #E ${PLUGIN_SCHEME}2://lollipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop - #E - #E If you specify ${PLUGIN_VARIABLE}_DATABASE_SCHEME to equal `http`, we'll also automatically adjust ${PLUGIN_DEFAULT_ALIAS}_URL to match the http interface: - #E - #E http://lollipop:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[1]} + #E ${PLUGIN_SCHEME}2://mysql:SOME_PASSWORD@dokku-${PLUGIN_COMMAND_PREFIX}-lollipop:${PLUGIN_DATASTORE_PORTS[0]}/lollipop #A service, service to run command against #A app, app to run command against #F -a|--alias "BLUE_DATABASE", an alternative alias to use for linking to an app via environment variable