Commit Graph

41 Commits

Author SHA1 Message Date
Nikita P. Shupeyko
a31f5090d1 Update the docs 2018-03-09 21:55:30 +03:00
Nikita P. Shupeyko
9cd0ee0272 Document merge_production_dotenvs_in_dotenv.py usage 2018-03-09 13:16:56 +03:00
Nikita P. Shupeyko
5543359382 Distinguish between POSTGRES_DB and POSTGRES_USER
Closes #1301.
2018-03-08 19:04:10 +03:00
Nikita Shupeyko
3f8aa26d0f
Group environment variables by the corresponding directories (#1295)
* Update generated project's .gitignore

* Post-gen gitignore .env/ and .env

* Fix linesep between gitignored entries

* Persist `.env/**/*` files into cookiecutter-django's VCS

* Rename .env/ to .envs/

* Reference the newly created .envs/**/.* files in local.yml

* Reference the newly created .envs/**/.* files in production.yml

* Delete .env.example

* Refactor post-gen-project.py

Closes #1299.

* Implement production-dotenv-files-to-dotenv-file merge script

* Create shared PyCharm Run Configuration for the automation script

* Randomize POSTGRES_PASSWORD in ./envs/(.local|.production)/.postgres

* Default POSTGRES_PASSWORD and POSTGRES_USER to random values

* Fix jinja linebreaks in local.yml

* Spaces in production.yml

* Fix post-merge leftovers & set DJANGO_ADMIN_URL automatically

* Prettify here and there

* Fix FileNotFoundError

* Leave a TODO in post_gen_hook.py

* Introduce keep_local_envs_in_vcs option

* Remove envs when not opted for

* Inline pre_gen_project.py if-condition

* Get rid of PROJECT_DIR_PATH in post_gen_project.py

* Clean up the docs

* Match copyright notices

* Document envs ins and outs
2018-03-08 15:56:15 +03:00
Shupeyko Nikita
fe903e5c14 Fix docs erros/typos (#1264)
* Fix #.1

* Fix #.2

[Running management commands: "docker-compose -f production.yml run" to "docker-compose -f local.yml run'](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html#running-management-commands).

* Fix #.3

Designate @bertdemiranda as a contributor (#1242).
2017-07-31 13:27:58 +03:00
Bert de Miranda
ce33b0c498 Update developing-locally-docker.rst (#1242) 2017-07-31 13:16:38 +03:00
Shupeyko Nikita
e889316b11 Rename dev.yml to local.yml (#1227)
* Rename dev.yml to local.yml

Closes #1226.

* Rename docker-compose.yml to production.yml
2017-07-14 17:09:41 +03:00
Shupeyko Nikita
1f7be4eb57 Revert "Node.JS + docker-compose = ♥" (#1206)
* Revert "[Fix] #1173 Nginx SSL redirect loop (#1174)"

This reverts commit cabcc7b106.

* Revert "Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165)"

This reverts commit 83c8594203.

* Revert "Fix index.rst sphinx warnings (#1166)"

This reverts commit 51dd0b5e73.

* Revert "Pin mailhog Docker image to v1.0.0 (#1201)"

This reverts commit d9f870461b.

* Revert "Node.JS + docker-compose = ♥ (#1128)"

This reverts commit 4b06fe3958.
2017-06-21 23:12:22 +03:00
Shupeyko Nikita
83c8594203 Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165) 2017-06-20 23:29:56 +03:00
Shupeyko Nikita
4b06fe3958 Node.JS + docker-compose = ♥ (#1128)
* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Fix typo

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Revert "Fix typo"

This reverts commit 02033729b5.

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Fix typo

* Revert "Fix typo"

This reverts commit 02033729b5.

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Remove Gulp-Docker integraton not supported initialization message
2017-06-20 22:48:17 +03:00
Cristian Samaniego
7c7176d4f9 Fix ipdb docker-compose needed command (#1175)
'run' must be after the -f flag
2017-05-19 21:26:20 +03:00
Jimmy Gitonga
f4ef73efbf ADDED: HTTPS is on by default (#1025)
ADDED: HTTPS is on by default. This will give a new user an
understanding of why Cookie Django is set up securely for deployment in
a production environment.
2017-02-13 12:27:09 -08:00
Michael Gecht
3a7a75ad9c Add documentation for Docker users on Windows (#845)
* Added usage notice for Windows users with Docker

* Updated CONTRIBUTORS.rst
2016-11-02 10:12:06 +01:00
Andreas
9f2fa4a0a9 Update to use Docker for Mac/Windows (#786)
Removed sections about using Docker Toolbox with virtualbox and added links to Docker for Mac/Windows.
Docker for Mac/Windows uses native virtual machines instead of virtualbox and introduces many improvements.
See: https://blog.docker.com/2016/03/docker-for-mac-windows-beta/

Resolves: #706
2016-09-12 15:53:21 +02:00
Daniel Roy Greenfeld
0a6b06ebe4 Breakup the backups section for docker into its own document 2016-06-14 14:32:14 -07:00
Audrey Roy Greenfeld
ad4082ceae Minor doc improvements 2016-06-13 08:40:48 -07:00
kappataumu
eeae4e8978 Move e-mail backend setup info for docker to the appropriate section 2016-06-13 12:56:12 +00:00
mjsisley
fd9795992a sync with master 2016-06-03 17:21:24 -07:00
mjsisley
6885547b6a Adding documentation for debugging with Docker (#575)
* Adding documentation for debugging with Docker

* Add -f dev.yml
2016-06-03 12:50:23 -07:00
mjsisley
329ff57551 Adding documentation for debugging with Docker 2016-06-03 06:04:16 -07:00
Jannis Gebauer
b21a27c1a5 fixed typo 2016-05-22 20:23:53 +02:00
phiberjenz
82dae58061 Added instructions on how to copy backups from Docker container to host 2016-05-19 15:30:30 +02:00
phiberjenz
8795dacbb3 Added instructions on how to copy backups from Docker container to host 2016-05-19 15:27:33 +02:00
Jannis Gebauer
5b1b6ae4aa added docker database backups documentation 2016-03-08 10:42:46 +01:00
Jannis Gebauer
9b5f91efb3 updates docs for docker 1.10 2016-03-08 10:07:48 +01:00
Jannis Gebauer
65e2d411a0 tweaked docker docs 2016-01-04 11:52:26 +01:00
MathijsHoogland
c04883fd52 Added clarification on building for local or production 2015-10-14 15:05:34 +02:00
Daniel Greenfeld
c1a90af9ad Update developing-locally-docker.rst 2015-10-04 12:09:18 -07:00
Audrey Roy Greenfeld
fdedd151ab Fix formatting in Detached Mode section. 2015-10-04 11:47:58 -07:00
Audrey Roy Greenfeld
d19ddbcf1e Explain Docker Toolbox better. 2015-10-03 16:59:52 -07:00
Audrey Roy Greenfeld
d09abc8d86 More simplification. 2015-10-03 16:56:53 -07:00
Audrey Roy Greenfeld
2d609432b9 Add @jayfk's note from #356. 2015-10-03 16:54:01 -07:00
Audrey Roy Greenfeld
c9b4d1f16e Unify docker-compose run sections. 2015-10-03 16:44:43 -07:00
Audrey Roy Greenfeld
765bb32fbe Simplify redundant parts of docker-compose instructions. 2015-10-03 16:35:48 -07:00
Audrey Roy Greenfeld
606b026a8c Simplify docs and un-deprecate the part that's still valid. 2015-10-03 16:21:08 -07:00
Audrey Roy Greenfeld
6258583fb1 Docker Toolbox includes Virtualbox. No need to repeat. 2015-10-03 16:15:02 -07:00
Audrey Roy Greenfeld
6f4cd7f0ce Merge pull request #350 from andor-pierdelacabeza/patch-1
Fixed reStructuredText (RST) format
2015-09-29 11:08:19 -07:00
Jannis Gebauer
d8a7081d4c Added advice on how to persist changes with boot2docker 2015-09-28 09:42:13 +02:00
Alvaro [Andor]
bdd916835e Fixed reStructuredText (RST) format
The lack of a space between the '::' tag and the text did that the block around the code didn't appear.
2015-09-27 19:42:21 +02:00
Daniel Roy Greenfeld
698c990cbd Refactored the Docker docs and added indexes. 2015-09-18 14:26:29 -07:00
Daniel Roy Greenfeld
27b59b460c Beginning of reorganization of documentation per #335
* Created top-level docs Sphinx directory
* Moved development instructions out of /README.rst and into /docs/
2015-09-18 09:22:55 -07:00