Commit Graph

153 Commits

Author SHA1 Message Date
Jose Diaz-Gonzalez
60d62842c7 quote docker pull call 2016-05-08 15:13:25 -04:00
Jose Diaz-Gonzalez
2d905a5fe9 fix read call 2016-05-08 15:13:18 -04:00
Jose Diaz-Gonzalez
d30c101fe3 Merge pull request #49 from dokku/minor-changes
Minor changes
2016-05-08 03:49:00 -04:00
Jose Diaz-Gonzalez
590c7f57ac use grep -q when checking for docker images 2016-05-08 02:51:27 -04:00
Jose Diaz-Gonzalez
c4c3805c13 Quote more variables 2016-05-08 02:51:06 -04:00
Jose Diaz-Gonzalez
ad84ddea31 Add a dummy lsb_release command to test binaries
This should allow us to run tests on os x using the current dokku binary
2016-05-08 01:35:11 -04:00
Jose Diaz-Gonzalez
fd112305d9 Download correct version of plugn when running tests under OS X 2016-05-08 01:34:40 -04:00
Jose Diaz-Gonzalez
56a1b3262a Merge pull request #51 from sglebs/master
fix for #50 - remove /0 , be heroku-compatible
2016-05-06 10:07:15 -04:00
Marcio Marchini
423bf1a4ef fix for #50 - remove /0 , be heroku-compatible 2016-05-05 13:08:11 -03:00
Jose Diaz-Gonzalez
5b61dfda57 Move command check before DOKKU_TRACE to reduce trace output 2016-05-04 13:59:33 -04:00
Jose Diaz-Gonzalez
10e2afbdef quote $APP variable 2016-05-04 13:58:14 -04:00
Jose Diaz-Gonzalez
817ebbd405 Rework how config vars are sourced
- ensure we source config/functions from the correct directory
- move config sourcing up before DOKKU_TRACE to reduce trace output
2016-05-04 13:57:49 -04:00
Jose Diaz-Gonzalez
5df1bc8669 Add testing for all supported versions of dokku
Also drop support for 0.3.x
2016-05-04 13:55:59 -04:00
Jose Diaz-Gonzalez
961aad764b Merge pull request #48 from dokku/start-container
create container if not exists on service:start
2016-05-04 01:33:52 -04:00
Jose Diaz-Gonzalez
eae373e679 create container if not exists on service:start 2016-05-04 00:52:11 -04:00
Jose Diaz-Gonzalez
f52ad1a27f Merge pull request #47 from dokku/database-adapter
Read REDIS_DATABASE_SCHEME variable from app when setting REDIS_URL
2016-04-19 15:14:30 -04:00
Jose Diaz-Gonzalez
5bcaf4fec5 Read REDIS_DATABASE_SCHEME variable from app when setting REDIS_URL 2016-04-19 14:52:09 -04:00
Jose Diaz-Gonzalez
82ed92bb6e Merge pull request #46 from treythomas123/master
Automatically pull image if it's not already downloaded
2016-04-18 20:48:36 -04:00
Trey Thomas
a096291fa0 Automatically pull image if it's not already downloaded 2016-04-18 16:45:37 -06:00
Jose Diaz-Gonzalez
350ae6f745 Merge pull request #45 from DNSFilter/master
Updated to 3.0.7
2016-04-12 13:59:35 -04:00
Mike Schroll
8e47169fb8 Updated to 3.0.7 2016-04-12 10:30:43 -04:00
Jose Diaz-Gonzalez
659cd08481 Merge pull request #40 from ebeigarts/export-fix
Fix exit code for redis:export when SSH_TTY is not present
2016-02-25 01:34:56 -05:00
Edgars Beigarts
fdd135f620 Fix exit code for redis:export when SSH_TTY is not present 2016-02-24 09:35:22 +02:00
Jose Diaz-Gonzalez
4aeccafd15 Merge pull request #39 from dhruvio/patch-1
Support custom redis.conf files
2016-02-03 00:48:54 -05:00
Dhruv Dang
0cbd4a8608 Pull the correct default redis.conf
Pulls the correct default `redis.conf`file based on the version supplied in the `REDIS_IMAGE_VERSION` environment variable
2016-01-25 00:22:55 -08:00
Dhruv Dang
91d7df92ca Support custom redis.conf files
Even though the `$SERVICE_ROOT/config` volume is mapped to the `/usr/local/etc/redis` folder in the container, any specified `redis.conf` file in `$SERVICE_ROOT/config` will not be used by the running `redis-server` process. This pull request solves that problem, by downloading the `redis-stable/redis.conf` file from the redis website to `$SERVICE_ROOT/config/redis.conf`, then runs the redis server process in the container as `redis-server /usr/local/etc/redis/redis.conf`.

Users of `dokku-redis` will be able to configure the `$SERVICE_ROOT/config/redis.conf` file to their liking, restart the redis container and then see their changed configuration in effect.

This references [this issue](https://github.com/dokku/dokku-redis/issues/30).
2016-01-24 00:56:17 -08:00
Jose Diaz-Gonzalez
0f7b6ecf45 Merge pull request #37 from dokku/fix-tests
Fix tests
2016-01-17 21:19:53 -05:00
Jose Diaz-Gonzalez
b8c3312ae7 Upgrade testing environment to trusty 2016-01-17 21:08:06 -05:00
Jose Diaz-Gonzalez
bda3ad2c10 Remove invalid service directory during command runs
Refs dokku/dokku-mariadb#30
2016-01-17 21:07:55 -05:00
Jose Diaz-Gonzalez
06ff6c013f Upgrade plugn 2016-01-17 21:06:45 -05:00
Jose Diaz-Gonzalez
996368201f Add vagrant setup for local testing 2016-01-17 21:06:21 -05:00
Jose Diaz-Gonzalez
1c364fca3c Merge pull request #35 from dokku/lg-fix-tests
Fix tests setup
2016-01-17 17:09:44 -05:00
Jose Diaz-Gonzalez
41578c08a1 Merge pull request #36 from dokku/version-upgrade
Upgrade image version to 3.0.6
2016-01-17 01:08:33 -05:00
Jose Diaz-Gonzalez
1b3daa861e Upgrade image version to 3.0.6 2016-01-17 01:08:06 -05:00
Loïc Guitaut
5c1c1e69d9 Fix tests setup 2015-11-30 17:23:38 +01:00
Jose Diaz-Gonzalez
4fb1e0786d Merge pull request #34 from dokku/container-environment-variables
Add support for custom environment variables when starting a service container
2015-11-05 01:46:44 -05:00
Jose Diaz-Gonzalez
e3b0228881 Add support for custom environment variables when starting a service container 2015-11-05 01:23:17 -05:00
Jose Diaz-Gonzalez
4aeb0f1e8c Update README.md -> <file> arg for export command 2015-10-29 15:56:30 -04:00
Jose Diaz-Gonzalez
02b412bc9d Merge pull request #31 from dokku/josegonzalez-patch-1
Use redis 3.0.5
2015-10-26 22:17:58 -04:00
Jose Diaz-Gonzalez
2e7a3ce709 Use redis 3.0.5
Closes #30
2015-10-26 22:00:25 -04:00
Jose Diaz-Gonzalez
414f10111d Merge pull request #33 from dokku/lg-update-readme
Update README about docker env var
2015-10-21 14:09:24 -04:00
Loïc Guitaut
4e606e88b5 Update README about docker env var 2015-10-21 16:24:55 +02:00
Jose Diaz-Gonzalez
62c624d745 Merge pull request #32 from dokku/lg-fix-export-over-ssh
Fix export when using `ssh -t`
2015-10-19 06:05:31 -04:00
Loïc Guitaut
06c30ea25e Fix export when using ssh -t 2015-10-19 11:43:32 +02:00
Jose Diaz-Gonzalez
c21ac89529 Merge pull request #29 from dokku/lg-list-in-columns
Display infos from `list` command in columns
2015-10-13 04:57:00 -04:00
Loïc Guitaut
9f3ae5d078 Display infos from list command in columns
Also add a LINKS column to easily view which services are linked to
which apps
2015-10-13 10:47:18 +02:00
Jose Diaz-Gonzalez
95347a4fc4 Merge pull request #28 from dokku/lg-fix-destroy
Fix the `destroy` command
2015-10-12 14:09:04 -04:00
Loïc Guitaut
a2427837dc 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-12 11:12:30 +02:00
Jose Diaz-Gonzalez
0f4fdb414c Merge pull request #27 from dokku/lg-revamp-link-unlink
Revamp link/unlink commands
2015-10-05 10:34:03 -04:00
Loïc Guitaut
baeea96731 Revamp link/unlink commands
Previously we were exporting `REDIS_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 `REDIS_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 `REDIS_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_REDIS_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-10-05 15:29:36 +02:00