10 Commits

Author	SHA1	Message	Date
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
Shupeyko Nikita	65e64fe364	Fix CELERY_BROKER_URL naming mismatch (#1143) ... * Fix CELERY_BROKER_URL naming mismatch Closes #1116 * Fix all occurences	2017-04-24 19:35:58 +03: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
William Archinal	f3ea2570ab	Use Argon2 password hashing algorithm by default (#1079)	2017-03-16 19:19:42 -07:00
Burhan Khalid	04146d580e	version bumps	2017-03-03 09:11:54 +03: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
Fábio C. Barrionuevo da Luz	a0efe83901	fix issue #1039	2017-02-15 18:15:16 -03:00
Mesut YILMAZ	3cd57880e0	Removed redeclared env	2017-02-15 11:17:34 +03:00
Daniel Roy Greenfeld	9a837171b6	Merge branch 'make-settings-consistent-w-req' of https://github.com/statwonk/cookiecutter-django into statwonk-make-settings-consistent-w-req	2017-02-13 10:48:10 -08:00
statwonk	12a8875dce	Two Scoops 1.8 on p. 56 indicates base.txt is preferred for consistency	2017-01-16 21:18:07 -06:00