From 55f38414d137190d4e9bdd92fe58f252d5b08c07 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 16 Apr 2016 17:27:43 -0400 Subject: [PATCH 1/2] Add a note about the `nginx.conf.sigil` being publicly exposed, and how to remove it. [ci skip] --- docs/nginx.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/nginx.md b/docs/nginx.md index 52e8cb8b2..957beeb18 100644 --- a/docs/nginx.md +++ b/docs/nginx.md @@ -19,7 +19,10 @@ Dokku uses a templating library by the name of [sigil](https://github.com/glider - `ADD` it to your dockerfile `WORKDIR` - if your dockerfile has no `WORKDIR`, `ADD` it to the `/app` folder +> When using a custom `nginx.conf.sigil` file, depending upon your application configuration, you *may* be exposing the file externally. As this file is extracted before the container is run, you can, safely delete it in a custom `entrypoint.sh` configured in a Dockerfile `ENTRYPOINT`. + ### Example Custom Template + Use case: add an `X-Served-By` header to requests ``` upstream {{ .APP }} { From 80cc57caa042454467d4a7539bc21c664e1ffd7f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 16 Apr 2016 17:28:22 -0400 Subject: [PATCH 2/2] Add a note as to Dockerfile support being a power-user feature Closes #2067 [ci skip] --- docs/deployment/dockerfiles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/deployment/dockerfiles.md b/docs/deployment/dockerfiles.md index 2681aa19c..165b3931f 100644 --- a/docs/deployment/dockerfiles.md +++ b/docs/deployment/dockerfiles.md @@ -4,6 +4,8 @@ While Dokku normally defaults to using [heroku buildpacks](https://devcenter.heroku.com/articles/buildpacks) for deployment, you can also use docker's native `Dockerfile` system to define a container. +> Dockerfile support is considered a **Power User** feature. By using Dockerfile-based deployment, you agree that you will not have the same comfort as that enjoyed by Buildpack users, and Dokku features may work differently. Differences between the two systems will be documented here. + To use a dockerfiles for deployment, commit a valid `Dockerfile` to the root of your repository and push the repository to your Dokku installation. If this file is detected, Dokku will default to using it to construct containers **except** in the following two cases: - The application has a `BUILDPACK_URL` environment variable set via the `dokku config:set` command or in a committed `.env` file. In this case, Dokku will use your specified buildpack.