Commit Graph

76 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
f1d7cea57b Merge pull request #29 from dokku/lg-fix-hostname
Replace underscore by dash in exposed hostname
2015-09-29 13:05:52 -04:00
Loïc Guitaut
f0a647053b Replace underscore by dash in exposed hostname
Fixes #28
2015-09-29 18:51:49 +02:00
Jose Diaz-Gonzalez
78314ef8ad Merge pull request #27 from dokku/lg-export-config
Revamp link/unlink commands
2015-09-28 12:26:48 -04:00
Loïc Guitaut
63047297ea Revamp link/unlink commands
Previously we were exporting `DATABASE_URL` via the docker-args* hooks.
This seems to confuse our users (since the env var is not displayed
when calling `dokku config`) and in some cases it also seems that the
env var is not correctly set.
Another problem is if several services are linked to the same app and
if they are exporting `DATABASE_URL` as well. Then we don’t know what
will be set.

To resolve theses issues, this patch changes the way we manage the env
vars. We use standard dokku commands (`config` and `docker-options`) so
config is set on the linked application and can be reviewed by the user
easily.
We also handle the case where `DATABASE_URL` is already set on the
linked application. When it’s the case, we automatically generate
another env var based on the following pattern: DOKKU_<service
name>_<random unused color>_URL. For example, this can give:
DOKKU_POSTGRES_BLACK_URL.

Since naming is now handled automatically, the `alias` command has been
removed. If the user wants to set a different env var on her app, it’s
just a matter of using `dokku config:set` and pasting the wanted value.

IP in DSN has been removed in favor of host name exported by docker in
the container. This is more robust and simpler since the IP can change
but the name will remain the same if the service container restarts for
instance.

With all those changes, a new command has been introduced: `promote`.
The goal of this command is to easily set a service as the primary one
when several are linked to an app. (see README for an example)
2015-09-28 18:21:52 +02:00
Jose Diaz-Gonzalez
ad0da307d5 Merge pull request #26 from dokku/josegonzalez-patch-1
Add postgres:help command
2015-09-27 17:26:50 -04:00
Jose Diaz-Gonzalez
98b6481274 Add postgres:help command 2015-09-27 17:18:21 -04:00
Jose Diaz-Gonzalez
e09d8626b6 Update README.md
Add a note explaining how to examine the environment variables (through `dokku run my-app env` rather than `dokku config my-app`)
2015-09-24 12:06:44 -04:00
Jose Diaz-Gonzalez
f607b19002 Merge pull request #25 from dokku/lg-fix-wait-image
Use our own image to wait for services
2015-09-24 11:47:31 -04:00
Loïc Guitaut
a6da4ea218 Use our own image to wait for services 2015-09-24 11:47:11 +02:00
Jose Diaz-Gonzalez
1d843ae3df Merge pull request #24 from dokku/josegonzalez-patch-1
Fix overlapping exported config
2015-09-23 15:12:17 -04:00
Jose Diaz-Gonzalez
b8abc90885 Set POSTGRES_ROOT environment variable as well
Since PLUGIN_DATA_ROOT is not directly overrideable anymore, we need to *also* set this env var here.
2015-09-23 15:04:10 -04:00
Jose Diaz-Gonzalez
c573398c35 Fix overlapping exported config
If using multiple official dokku datastorage plugins, it is possible to get into a case where the `PLUGIN_DATA_ROOT` would be set incorrectly for other plugins.

Refs dokku/dokku-redis#20
2015-09-23 14:38:10 -04:00
Jose Diaz-Gonzalez
c6dd00da0d Update installation documentation 2015-09-22 12:07:30 -04:00
Jose Diaz-Gonzalez
238141f950 Merge pull request #23 from dokku/lg-fix-install
Fix wrong version check on docker wait image
2015-09-22 11:57:22 -04:00
Loïc Guitaut
16e6f0899c Fix wrong version check on docker wait image 2015-09-22 16:03:13 +02:00
Jose Diaz-Gonzalez
140a4207da Merge pull request #21 from dokku/lg-check-images
Add checks for all docker images in install hook
2015-09-21 10:16:07 -04:00
Jose Diaz-Gonzalez
dac18e2fe1 Merge pull request #20 from dokku/lg-docker-args-hooks
Use docker-args-* hooks instead of deprecated one
2015-09-21 10:15:57 -04:00
Loïc Guitaut
c62b6ad05a Add checks for all docker images in install hook 2015-09-21 14:19:00 +02:00
Loïc Guitaut
e6745eb69c Use docker-args-* hooks instead of deprecated one 2015-09-21 09:51:43 +02:00
Jose Diaz-Gonzalez
b351c4b3c5 Merge pull request #19 from dokku/lg-fix-tty-on-connect
Do not always allocate a tty on `connect`
2015-09-18 20:00:04 -04:00
Loïc Guitaut
06e075d3a1 Do not always allocate a tty on connect
To import SQL files `connect` has to be used instead of `import`. Doing
so can’t work with the `-t` docker option, so now we check for a tty
before using this option.

Fixes #18
2015-09-19 00:52:33 +02:00
Jose Diaz-Gonzalez
0428cd3a49 Merge pull request #16 from dokku/lg-fix-for-0.4
Fix compatibility with dokku 0.4+
2015-09-16 14:59:25 -07:00
Loïc Guitaut
88d92122c8 Fix compatibility with dokku 0.4+ 2015-09-16 23:51:06 +02:00
Jose Diaz-Gonzalez
1e1827a96e Merge pull request #15 from dokku/lg-how-to-upgrade
Add upgrade/downgrade instructions
2015-09-15 15:27:46 -07:00
Loïc Guitaut
71f3d3fee5 Add upgrade/downgrade instructions 2015-09-16 00:13:29 +02:00
Jose Diaz-Gonzalez
54476e3fd9 Merge pull request #14 from dokku/lg-display-version-in-list
Display image & version in `list`
2015-09-15 15:12:30 -07:00
Loïc Guitaut
e9618101e5 Display image & version in list 2015-09-16 00:05:18 +02:00
Jose Diaz-Gonzalez
89de894eee Merge pull request #13 from dokku/lg-fix-tests-0.4
Add compatibility for tests with dokku 0.4+
2015-09-15 14:12:23 -07:00
Loïc Guitaut
25820403e2 Add compatibility for tests with dokku 0.4+ 2015-09-15 23:05:56 +02:00
Jose Diaz-Gonzalez
a4870f72ed Mention that the plugin defaults to installing a version 2015-09-15 02:02:18 -07:00
Jose Diaz-Gonzalez
04297681bc Merge pull request #11 from dokku/pin-version
Pin version to 9.4.4
2015-09-15 01:57:22 -07:00
Jose Diaz-Gonzalez
b7cbb54712 Pin version to 9.4.4 2015-09-15 01:53:09 -07:00
Jose Diaz-Gonzalez
ecb2d49a1c Merge pull request #10 from dokku/lg-use-stable-version
Use latest stable release of PostgreSQL
2015-09-14 19:38:20 -04:00
Loïc Guitaut
fd60d30631 Use latest stable release of PostgreSQL
9.4 branch is latest stable, 9.5 is a development version.
2015-09-14 23:35:42 +02:00
Jose Diaz-Gonzalez
8c5fc18bee Merge pull request #9 from dokku/lg-fix-readme
Add missing doc in README
2015-09-12 12:55:57 -04:00
Loïc Guitaut
65ef25bc32 Add missing doc in README 2015-09-12 00:34:20 +02:00
Jose Diaz-Gonzalez
a3fb4fa772 Merge pull request #8 from dokku/lg-help-output
Compatibility with dokku 0.3.x & 0.4.x for help output
2015-09-11 17:54:31 -04:00
Loïc Guitaut
b2a83ca9a3 Compatibility with dokku 0.3.x & 0.4.x for help output 2015-09-11 23:30:55 +02:00
Jose Diaz-Gonzalez
e2cb33602f Merge pull request #7 from dokku/lg-import-clone
Import and clone commands
2015-09-10 20:58:53 -04:00
Loïc Guitaut
153b1b826e Implement postgres:clone command 2015-09-11 02:55:52 +02:00
Loïc Guitaut
35da137071 Implement postgres:import command 2015-09-11 02:09:45 +02:00
Jose Diaz-Gonzalez
79d2e990dd Merge pull request #6 from dokku/lg-add-tests
Add tests for every implemented command
2015-09-10 10:48:25 -04:00
Loïc Guitaut
ca88f2bdce Add tests for every implemented command 2015-09-10 11:57:24 +02:00
Jose Diaz-Gonzalez
860e5c7f9b Merge pull request #5 from dokku/lg-password-with-openssl-rand
Use openssl rand to generate password
2015-09-09 18:43:00 -04:00
Loïc Guitaut
db3763aa83 Use openssl rand to generate password
It should be more secure than hashing the current time.
2015-09-09 23:39:29 +02:00
Jose Diaz-Gonzalez
ae26e2060c Merge pull request #4 from dokku/lg-various-updates
Various updates
2015-09-09 12:38:43 -04:00
Loïc Guitaut
6741582b92 Use PG tools from image when creating new DB 2015-09-09 18:30:17 +02:00
Loïc Guitaut
1085a0a01f Use aanand/wait image to wait for service to be ready 2015-09-09 18:21:04 +02:00
Loïc Guitaut
32af344146 Remove call to docker kill 2015-09-09 18:15:53 +02:00
Jose Diaz-Gonzalez
ae02e70eae Merge pull request #3 from dokku/lg-use-tools-from-image
Use psql from docker image
2015-09-09 11:26:03 -04:00