8 Commits

Author	SHA1	Message	Date
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	d9f870461b	Pin mailhog Docker image to v1.0.0 (#1201)	2017-06-20 23:27:41 +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
Shupeyko Nikita	7da1bf79b8	Replace links section with depends_on in docker-compose config files (#1092) ... Closes #1091	2017-03-24 18:45:31 +01:00
Jannis Gebauer	34631ad819	adds the ability to wait for the postgres container (#736)	2016-08-16 12:20:41 -07:00
Julien Almarcha	13faa21799	automatically update INTERNAL_IPS (#600) ... * change local config to automatically update INTERNAL_IPS when developping with docker * Update local.py Move import to top * Update local.py Bug fix and remove blank line * Update local.py * flake8 compliance * add env var check before updating INTERNAL_IPS * flake8 compliance * flake8 compliance	2016-06-17 19:09:08 -07:00
Jannis Gebauer	24d75ebe45	resolved merge conflicts	2016-05-22 20:18:08 +02:00
Audrey Roy Greenfeld	15f350f05e	Change repo_name to project_slug for clarity.	2016-04-20 10:00:35 -07:00