Commit graph

11 commits

Author SHA1 Message Date
Colby Gutierrez-Kraybill
4749bd1bbd Add docker-up and docker-down rules to Makefile. Now depends on a npm module 'scratch-docker' which brings a network configuration script that handles creating a named docker network that all other scratch repos that have docker configurations depend on 2018-08-21 13:09:38 -04:00
Ben Wheeler
d5e1401968 reverted docker-compose fallback 2018-07-31 15:06:12 -04:00
Ben Wheeler
097fb66955 currentStudioIds now an array; reverted a few changes 2018-07-31 15:00:56 -04:00
Ben Wheeler
8eec0d3a87 corrected parentheses for lint error 2018-07-27 10:49:42 -04:00
Ben Wheeler
66c21d8b33 merged docker-compose 2018-07-24 09:29:07 -04:00
Ben Wheeler
f176835df6 removed whitespace 2018-07-23 09:50:26 -04:00
Colby Gutierrez-Kraybill
1624c92ef4 Add USE_DOCKER_WATCHOPTIONS
Let docker containers to make use of watchOptions and polling
2018-07-18 11:48:52 -04:00
Colby Gutierrez-Kraybill
64d254e869 FALLBACK should reference localhost not docker specific scratchr2-app end point 2018-07-11 11:10:38 -04:00
Colby Gutierrez-Kraybill
9c35b80073 Update to track changes in docker-compose behavior
docker-compose no longer strips `-` from the project name, which makes `scratchapi` now `scratch-api` when referencing the network.
2018-07-11 10:42:09 -04:00
Colby Gutierrez-Kraybill
878116f949 Add protocol and localhost
With API_HOST and FALLBACK, need full protocol.  API_HOST must be localhost, as it’s the browser performing the local request and does not know the docker network hostnames assigned during docker-compose
2018-03-23 15:49:40 -04:00
Colby Gutierrez-Kraybill
d428025287 Need protocol
With API_HOST and FALLBACK, need full protocol.  API_HOST must be localhost, as it’s the browser performing the local request and does not know the docker network hostnames assigned during docker-compose
2018-03-23 15:49:02 -04:00