Commit Graph

213 Commits

Author SHA1 Message Date
Nikita P. Shupeyko
00fbf63939 Document use_travisci cookiecutter option 2018-03-05 13:12:33 +03:00
Wan Liuyang
5f068dd972 Revert environment variables and update docs 2018-02-28 11:33:39 +08:00
Wan Liuyang
39d2000856 Merge branch 'master' of github.com:sfdye/cookiecutter-django into use-aws-roles 2018-02-28 10:16:48 +08:00
Nikita Shupeyko
86e33e8714
Refactor *_gen_project hooks (#1490)
* Fix ./hooks/pre_gen_project.py asking user to select an option once only

+ prettify output

* Fix pre_gen hook not really exiting when it should

* Refactor & prettify ./hooks/post_gen_project.py

* Ensure same POSTGRES_USER is set across environments

+ get rid of env.example in favor of pre-generated .env.
2018-02-07 22:52:52 +03:00
Bruno Alla
090c81731b
Merge pull request #1418 from reggieriser/django_python_upgrade_cleanups
Fixing leftovers from migration to Django 1.11 and Python 3.6.
2018-02-07 14:52:27 +00:00
Reggie Riser
3512bb6c32
Delete deployment-with-elastic-beanstalk.rst 2018-02-06 17:18:03 -05:00
Wan Liuyang
7aabfa0c36 Fix typo and revert AWS environment variable 2018-02-06 15:52:34 +08:00
Wan Liuyang
fd2e917ceb Use AWS IAM roles
- Remove usage of AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
- Add instructions to set up IAM role
2018-02-06 15:14:37 +08:00
Bruno Alla
af12f39996 Improve custom_bootstrap_compilation option (#1429)
* Add Bootstrap to package.json in case of custom_bootstrap_compilation

* Update JS task runners and base HTML to handle custom scss compilation

* Generate a vendors.js with custom bootstrap compilation + Gulp

* Update documentation accordingly

* Add missing if/endif in gulpfile

* Update to Bootstrap v4 final
2018-01-20 17:05:12 -08:00
Daniel Roy Greenfeld
793a46ba45 Removed expiramental elastic beanstalk support and bumped official Django version to 1.11.9 2018-01-15 12:33:51 -08:00
pdehaye
184b3584a0 Helpful warning for Beanstalk/python 3.6 (#1432) 2018-01-04 17:54:58 -08:00
Reggie Riser
f7bd7a5814 Fixing leftovers from migration to Django 1.11 and Python 3.6. 2018-01-03 08:44:54 -05:00
Rafael Laverde
1d55a608c0 Change pep 8 for pycodestyle in docs and project requirements (#1332)
* Change pep8 for pycodestyle in the docs.

* Change pep8 for pycodestyle in project requirements.
2017-09-17 21:56:15 +03:00
Jannis Gebauer
5492a2b387 update with instructions for caddy, removing nginx 2017-08-14 11:48:17 +02:00
Jannis Gebauer
8801c50867 switch to caddy (#1282) 2017-08-11 11:16:15 +02:00
Ben Warren
ffedad9103 Add project generation option docs (#1267)
* Add project generation option docs

* Alter wording
2017-08-01 20:06:07 +03:00
Nathan Victor
b4e68a6bf1 Update 404 with how to link (#1244) 2017-07-31 16:57:33 +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
37837e9902 Fix ALLOWED_HOSTS (#1164) 2017-07-30 15:43:01 +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
51dd0b5e73 Fix index.rst sphinx warnings (#1166) 2017-06-20 23:29:31 +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
Emile Petrone
ec62188fae Fix hard coded email (#1193) 2017-06-14 01:00:14 +03:00
mekhami
611159eecf Create deployment-with-docker.rst (#1189)
Just a little extra clarity on postgres and the .env file, inspired by #1188.
2017-06-08 12:55:29 -07:00
Cristian Samaniego
1ddc3fcef8 Fix typo and deprecated option in certbot command (#1185)
The --standalone-supported-challenges option has been deprecated since certbot version 0.9.0.
2017-06-02 22:47:53 +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
Shupeyko Nikita
27fb6e1a0a Fix linters.rst sphinx warnings (#1167)
* Fix linters.rst sphinx warnings

* Stick with `` instead of `
2017-05-15 15:01:19 +03:00
Alexandre Provencio
bd487e8ff9 Fix docker's letsencrypt renewal command (#942) 2017-04-24 15:42:46 -07:00
jduraj
9ea4ace6fb Docs: add more info for docker production setup (#1134)
Missing .env variables can result in some functions crashing.
2017-04-24 10:09:21 -07:00
Daniel Roy Greenfeld
6aced9ba73 Remove Python 2.7 support per #1129 (#1130)
* Remove Python 2.7 support per

* Remove Python 2.7 references

* Remove Python 2.7 references

* remove python 2 entirely
2017-04-21 12:31:45 -07:00
Rafael Laverde
4156a99b6a Docs: Add missing MAILGUN_SENDER_DOMAIN setting in pythonanywhere wsgi configuration. (#1075) 2017-03-13 18:18:14 -07:00
Adam Kaliński
62214af49a Remove Webpack from docs (#1070)
* Remove Webpack from README.md

* Remove Webpack from docs
2017-03-05 09:32:28 -08:00
Reggie Riser
2006605e24 A few cleanups: 1) Fixed common.py references (now called base.py), 2) Made URLs consistent in pointing to dev Django docs as well as https, (#1037) 2017-02-21 11:55:51 -08: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
Cullen Rhodes
4d567c7d8e Remove mention of the deploy button from Heroku docs (#953)
Commit 04a58d5 removed the Heroku instant deploy button but the docs
still mention this as an option, this commit updates the docs to reflect
this change.
2017-02-13 10:41:01 -08:00
Audrey Roy Greenfeld
c72ac58300 Add missing string import 2017-02-13 10:39:43 -08:00
Sebastian Reyes Espinosa
e4d1f4dae6 An small pythonic approach to password (#949)
Providing a more pythonic line for password generation using for that the string content.
2017-02-13 10:37:36 -08:00
Matt Braymer-Hayes
5b75a9ccf2 1029: Fix typo in Docker deployment docs (#1030)
* #1029 Replace "wan't" with "want"

* #1029 Add self to CONTRIBUTORS.rst
2017-02-10 09:21:04 +01:00
Fábio C. Barrionuevo da Luz
10fa906599 add DJANGO_READ_DOT_ENV_FILE to settings docs 2017-01-09 16:02:53 -03: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
Audrey Roy Greenfeld
85756b7191 Finish first pass at Elastic Beanstalk documentation 2016-10-07 13:34:15 -07:00
Audrey Roy Greenfeld
19b709371f Elastic Beanstalk documentation cleanup 2016-09-30 10:33:46 -07:00
Fabio C. Barrioneuvo da Luz
e953fda8df fix documentation about contrib/sites migrations 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
f803f8f2ab FAQ entry on combining multiple deployment options 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
4b95bd9c5e A little cleanup of the EB docs 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
716717fe53 Fix markup 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
0eaf6a7b0c Fix FAQ 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
cac685d909 Add Experimental AWS Elastic Beanstalk support (#817)
Includes:

* First pass at Elastic Beanstalk integration
* Gets code and elasticache working
* Very rudimentary documentation
* Includes post hook cleanup
2016-09-29 01:43:48 -03:00
Delio Castillo
3d25befb3f Updates to anymail 0.5 and adds new config setting for MAILGUN_SENDER_DOMAIN 2016-09-22 11:42:16 -07: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
Jannis Gebauer
7d7b044432 Remove webpack and merge (#778) (#785)
* Remove webpack and merge

* Put postgresql_version line back in cookiecutter.json

* Put goldhand back in contributors file, added ssteinerX

* Add *.egginfo to .gitignore

* Fix dangling endif in README.rst
2016-09-12 00:22:21 +02:00
Jannis Gebauer
043ff3d8dc Merge pull request #636 from mirskiy/master
Changed nginx confs for dockers new networking
2016-08-31 11:39:16 +02:00
Andreas Meistad
41059ff4df Change use_python2 [N] to use_python3 [Y]
Fixes #747
2016-08-21 22:11:01 +02:00
Karlo Tamayo
95c31623c3 Update developing-locally-webpack.rst
Small typo fix
2016-08-18 17:10:11 -07:00
Manu Phatak
ca86da88c0 Update deployment-on-heroku.rst (#684) 2016-08-16 12:21:28 -07:00
Dan Mirsky
8f1ee0e68c Updated docker docs to renew with certbot
In order to resolve the name through docker's dns, we have to specify
the usual container name (certbot) - docker-compose only does
automatically this if you use `start certbot`, not with `run`.
Also added --rm to remove the container after it's done so we don't have
multiple with the same name
2016-07-25 16:07:48 -07:00
Karim Benbourenane
3bdb9bbd6e Update project-generation-options.rst
Added more complete documentation for the project generation options.
2016-06-28 17:16:07 -04:00
Will Farley
8880e777d2 WIP: Add webpack as an option (#610)
* Add webpack as an option

Adds webpack as a js_taskrunner option to cookiecutter-json. Will clone @hzdg/cookiecutter-webpack --pydanny-django branch into the project using cookiecutter's api in post_hooks.

The static webpack project will be placed into the <project_slug>/static/<project_slug>/ directory.
The webpack configs are placed in the ./config/ directory.

The cookiecutter-webpack project includes react / redux / karma configurations that are brought into the project.

* Add webpack documentation
2016-06-19 12:24:43 -07: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
Audrey Roy Greenfeld
082765a4fb Merge pull request #612 from kappataumu/fix-603
Fixes #603
2016-06-13 08:37:19 -07:00
kappataumu
eeae4e8978 Move e-mail backend setup info for docker to the appropriate section 2016-06-13 12:56:12 +00:00
kappataumu
bfe72d5276 Point to the docs instead of repeating everything 2016-06-13 12:32:13 +00:00
kappataumu
1e47efac8a Fix reST issues 2016-06-13 12:32:13 +00:00
kappataumu
8b8b13ed0d Fixes #603 2016-06-13 11:29:23 +00:00
Daniel Roy Greenfeld
0b59df7af4 Warn about scaling nginx 2016-06-12 23:11:50 -07:00
Antonia Blair
b100f2a00d Tweak env vars section of docs (#611)
Thanks for the PR! 🍡
2016-06-11 20:50:25 -07:00
Audrey Roy Greenfeld
56efcaa475 Minor deployment-with-docker.rst improvements 2016-06-08 12:51:55 -07:00
Audrey Roy Greenfeld
ae5be42ff4 Reorder Docker deployment sections. Fix #606 2016-06-08 12:36:34 -07:00
Audrey Roy Greenfeld
3c980f13a3 More Docker docs tidying 2016-06-08 12:33:18 -07:00
Audrey Roy Greenfeld
7de7aed7ab Copyright year in non-templated docs/ folder can't be templated 2016-06-08 11:31:33 -07:00
Audrey Roy Greenfeld
f358204bdc Minor improvements to 'Deployment with Docker'. Part of #566 2016-06-08 11:12:10 -07:00
Daniel Roy Greenfeld
f40f304457 Use sentry for error reporting 2016-06-05 10:47:07 -07:00
Daniel Roy Greenfeld
b2d0a86344 simplify cookiecutter.json 2016-06-04 17:16:48 -07:00
Daniel Roy Greenfeld
e5b3b85620 Reorder index 2016-06-04 16:11:14 -07:00
mjsisley
fd9795992a sync with master 2016-06-03 17:21:24 -07:00
Audrey Roy Greenfeld
39fe13bea8 Merge pull request #582 from EMCain/my-favorite-cookie
[wip] my-favorite-cookie tutorial
2016-06-03 15:40:36 -07:00
Audrey Roy Greenfeld
87845bd817 Temp quick fixes to improve developing-locally doc 2016-06-03 15:31:50 -07:00
Emily C
ffc83080c7 initial commit 2016-06-03 15:23:00 -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
Meghan Heintz
ecc81134dd Adding troubleshotting to index 2016-06-03 12:04:11 -07:00
Meghan Heintz
4b6707fe7b adding troubleshooting doc 2016-06-03 11:58:37 -07:00
mjsisley
b8e02d2189 Add certbot(letsencrypt) support for docker 2016-06-03 08:07:39 -07:00
mjsisley
329ff57551 Adding documentation for debugging with Docker 2016-06-03 06:04:16 -07:00
Meghan Heintz
a25c57f0f4 postgres installation guide for mac, windows IP (#571)
* postgres installation guide for mac windows IP

* postgres install guide for mac ip windows
2016-06-02 18:28:50 -07:00
shireenrao
e8b0baf36c Update developing locally docs on how to setup .env file
Even though a link to the django-environ is there, it may help to see that .env file needs to be present for it to work.
2016-05-23 22:37:47 -04:00
Jannis Gebauer
b21a27c1a5 fixed typo 2016-05-22 20:23:53 +02:00
Jannis Gebauer
c35fc6acbe Merge branch 'master' of https://github.com/phiberjenz/cookiecutter-django into phiberjenz-master 2016-05-22 20:19:04 +02:00
Jannis Gebauer
24d75ebe45 resolved merge conflicts 2016-05-22 20:18:08 +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
Daniel Roy Greenfeld
7b24c19ce5 Fix #524 2016-05-09 21:12:34 -07:00
Fabio C. Barrioneuvo da Luz
2b878fcf36 replace occurrences of readthedocs.org to readthedocs.io 2016-05-09 17:18:58 -03:00
shireenrao
8cbe97bb9f Added a comment on how to use mailhog
As somebody new to mailhog, I was a confused on how to use it. I first assumed, it was going to be used by the django app itself. After reading more on the internet I found it needed to be executed outside of the django application.
2016-05-09 14:33:21 -04:00
Audrey Roy Greenfeld
bd9e437717 Update name per #524 2016-05-08 21:31:12 -07:00
Daniel Roy Greenfeld
8ac31962d6 Added PythonAnywhere to the docs index 2016-04-26 21:57:38 -07:00
Daniel Roy Greenfeld
da76b4d62e Merge pull request #532 from hjwp/master
Deployment instructions for PythonAnywhere. Fixes #236
2016-04-26 21:50:22 -07:00