Commit Graph

207 Commits

Author SHA1 Message Date
Loïc Guitaut
4e0397610b Merge pull request #46 from leshik/secure_passwords
secure passwords
2015-12-01 15:19:54 +01:00
Alexey Zagarin
4e4c5241f7 secure passwords 2015-12-01 15:22:53 +03:00
Jose Diaz-Gonzalez
425642dc5c Merge pull request #47 from dokku/lg-fix-tests
Fix tests setup
2015-11-30 11:41:35 -05:00
Loïc Guitaut
fc8bb77539 Fix tests setup 2015-11-30 17:10:41 +01:00
Jose Diaz-Gonzalez
80abdfca2a Reorder env-file argument 2015-11-05 01:22:10 -05:00
Jose Diaz-Gonzalez
bdc21d9b13 clarify docs around setting custom env variables 2015-11-05 00:53:26 -05:00
Jose Diaz-Gonzalez
d1cf7cb427 Fix reference to ENV file 2015-11-05 00:45:07 -05:00
Jose Diaz-Gonzalez
864e8123b0 Rename ENVIRONMENT to ENV
The `ENV` file name is more often used in dokku than `ENVIRONMENT`.
2015-11-05 00:44:40 -05:00
Jose Diaz-Gonzalez
74ae1b5683 Merge pull request #40 from mcolyer/allow-postgres-restore
Allow use of postgres images with wal-e
2015-11-05 00:43:42 -05:00
Matt Colyer
6c6b040f4a Rename to DOCKER_CUSTOM_ENV 2015-11-04 17:38:49 -08:00
Matt Colyer
c68ac3be25 Fix lint failures
Also correct ; to be the proper delimiter.
2015-11-02 21:23:58 -08:00
Matt Colyer
50f980ce03 Switch to POSTGRES_DOCKER_ARGS variable
Previously extra command line arguments were passed after the command,
based on the discussion in https://github.com/dokku/dokku-postgres/pull/40,
it was agreed that using a single environment variable was more clear.
2015-11-02 21:05:41 -08:00
Jose Diaz-Gonzalez
762f09e91f Merge pull request #41 from samgclarke/update-readme
update README.md -> <file> arg for export command
2015-10-29 15:52:51 -04:00
Sam Clarke
d0a00c5a82 update README.md -> <file> arg for export command 2015-10-29 12:29:28 -07:00
Matt Colyer
a71847cc1e Move double quote 2015-10-27 07:09:47 -07:00
Matt Colyer
0a66e18ff3 Proceed on create if the database exists
This change is useful if the container image allows for you to restore
from a backup when starting.
2015-10-26 21:07:35 -07:00
Matt Colyer
3c1c8f9e80 Pass environment variables to docker container
This change allows arbitrary environment variables to be passed to the
underlying docker container. Useful when using postgres docker
containers which allow for additional configuration on top of the
official postgres image.

See https://github.com/mcolyer/docker-postgres-wale for an example.
2015-10-26 21:05:53 -07:00
Jose Diaz-Gonzalez
8f392acf22 Merge pull request #39 from dokku/lg-update-readme
Update README about docker env var
2015-10-21 14:08:31 -04:00
Loïc Guitaut
5db9586aee Update README about docker env var 2015-10-21 16:17:36 +02:00
Jose Diaz-Gonzalez
4fe74b82d8 Merge pull request #37 from dokku/lg-fix-export-over-ssh
Fix export when using `ssh -t`
2015-10-16 20:16:27 -04:00
Loïc Guitaut
e6338fdf56 Fix export when using ssh -t 2015-10-17 02:00:47 +02:00
Jose Diaz-Gonzalez
2d6684d6e3 Merge pull request #35 from dokku/lg-list-in-columns
Display infos from `list` command in columns
2015-10-12 14:10:42 -04:00
Loïc Guitaut
9e37cefbbf Display infos from list command in columns
Also add a LINKS column to easily view which services are linked to
which apps
2015-10-12 12:01:48 +02:00
Jose Diaz-Gonzalez
480b6f1836 Merge pull request #34 from dokku/lg-fix-destroy
Fix the `destroy` command
2015-10-09 14:46:38 -04:00
Loïc Guitaut
b2dbd036fc Fix the destroy command
Checking for container with its service name instead of ID.
Doing a chmod 777 on `/data` before removing data from the service.
2015-10-08 23:00:21 +02:00
Jose Diaz-Gonzalez
be3fc97e82 Merge pull request #32 from mak-it/volume
Fix /var/lib/postgresql/data volume mount point
2015-10-05 10:34:33 -04:00
Edgars Beigarts
abbf0b6f3d Fix /var/lib/postgresql/data volume mount point 2015-10-05 09:49:50 +03:00
Jose Diaz-Gonzalez
9b7443b820 Merge pull request #31 from dokku/lg-better-url-check
Use complete service URL when checking config
2015-09-30 18:23:29 -04:00
Loïc Guitaut
d6cb9b6834 Use complete service URL when checking config 2015-09-30 23:52:20 +02:00
Jose Diaz-Gonzalez
5c542287a3 Merge pull request #30 from dokku/lg-unlink-on-app-destroy
Remove linked app from links file when destroying app
2015-09-30 10:56:12 -04:00
Loïc Guitaut
bb7d44f39e Remove linked app from links file when destroying app 2015-09-29 23:10:26 +02:00
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