Skip to content

Commit 1eb1dc4

Browse files
committed
Clarify that Dockerfiles are not yet supported directly.
1 parent 5ee80eb commit 1eb1dc4

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Deis comes with out-of-the-box support for Ruby, Python, Node.js, Java, Clojure,
1717

1818
##### Deploy anything
1919

20-
Deploy a wide range of languages and frameworks with a simple `git push` using [Heroku Buildpacks](https://devcenter.heroku.com/articles/buildpacks) or [Dockerfiles](http://docs.docker.io/en/latest/use/builder/). Use custom Chef layers to deploy databases, middleware and other add-on services.
20+
Deploy a wide range of languages and frameworks with a simple `git push` using [Heroku Buildpacks](https://devcenter.heroku.com/articles/buildpacks) or (coming soon) [Dockerfiles](http://docs.docker.io/en/latest/use/builder/). Use custom Chef layers to deploy databases, middleware and other add-on services.
2121

2222
##### Control everything
2323

client/README.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ provide a private PaaS that is lightweight and flexible.
2323
Deis comes with out-of-the-box support for Ruby, Python, Node.js, Java,
2424
Clojure, Scala, Play, PHP, Perl, Dart and Go. However, Deis can deploy
2525
anything using Heroku Buildpacks, Docker images or Chef recipes. Deis is
26-
designed to work with any cloud provider. Currently Amazon EC2 and Rackspace
27-
Cloud are supported.
26+
designed to work with any cloud provider. Currently Amazon EC2, Rackspace,
27+
and DigitalOcean are supported.
2828

2929

3030
Why Deis?
@@ -34,8 +34,8 @@ Deploy anything
3434
---------------
3535

3636
Deploy a wide range of languages and frameworks with a simple git push
37-
using Heroku Buildpacks or Dockerfiles. Use custom Chef layers to deploy
38-
databases, middleware and other add-on services.
37+
using Heroku Buildpacks or (coming soon) Dockerfiles. Use custom Chef layers
38+
to deploy databases, middleware and other add-on services.
3939

4040

4141
Control everything
@@ -78,8 +78,8 @@ You should know the fully-qualified domain name of an existing
7878
Deis controller. To set up a Deis controller, see the
7979
`Installation`_ documentation.
8080

81-
Registration will discover SSH keys automatically and use the
82-
`standard environment variables`_ to configure the EC2 provider.
81+
Registration will discover SSH keys automatically and use environment variables
82+
to configure Amazon EC2, Rackspace, and DigitalOcean providers.
8383

8484
.. code-block:: console
8585

client/deis.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1627,7 +1627,8 @@ def providers_create(self, args):
16271627
16281628
This command is only necessary when adding a duplicate set of
16291629
credentials for a provider. User accounts start with empty providers,
1630-
EC2 and Rackspace by default, which should be updated in place.
1630+
EC2, Rackspace, and DigitalOcean by default, which should be updated
1631+
in place.
16311632
16321633
Use `providers:discover` to update the credentials for the default
16331634
providers created with your account.

0 commit comments

Comments
 (0)