diff --git a/README.md b/README.md index e22e4672..56240825 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Contributing ## Getting the code -### If you are setting up anyway on Windows using WSL - PLEASE MAKE SURE TO COMPLETE THE FOLLOWING STEPS FROM YOUR WSL TERMINAL!!! +### NOTE: If you are setting up anyway on Windows using WSL - PLEASE MAKE SURE TO COMPLETE THE FOLLOWING STEPS FROM YOUR WSL TERMINAL!!! 1. [Fork](https://github.com/data-for-change/anyway/fork) this repository on GitHub 1. `git clone https://github.com/*you*/anyway` diff --git a/docs/DOCKER.md b/docs/DOCKER.md index 495b415e..2a89220d 100644 --- a/docs/DOCKER.md +++ b/docs/DOCKER.md @@ -104,13 +104,15 @@ $ sudo docker login docker.pkg.github.com -u USERNAME `sudo docker-compose up --build anyway` This will start the containers. It will take a few minutes until it's done. +Note - At some point you should gett the message "Waiting for postgres server, 40 remaining attempts..." and a "count-down" from 40 will start. This is normal, let it continue running. + Note - If the "anyway" container does not start because of the error: "exec /anyway/docker-entrypoint.sh: no such file or directory", run `dos2unix` on all files mentioned in "important" note under the Windows section and go back to step 7. **8.** **You're all set!** ANYWAY is up and running with the DB data - connect to http://127.0.0.1:8080 Note - you won't see the map since the key works in production. -If you need to see the map for development email us [anyway@anyway.co.il](mailto:anyway@anyway.co.il) to get a developer key. -The developer key need to replace the production key in the file /anyway/blob/dev/templates/index.html where you can find: "https://maps.googleapis.com/maps/api/js?key=AIzaSyDUIWsBLkvIUwzLHMHos9qFebyJ63hEG2M&libraries=places,visualization&language=iw" (google maps url) -So if the developer key is "12345" the new url need to be is: "https://maps.googleapis.com/maps/api/js?key=12345&libraries=places,visualization&language=iw" +You now need to see the map for development, so contact us via email [anyway@anyway.co.il](mailto:anyway@anyway.co.il) to get a developer key. +The developer key needs to replace the production key in the file /anyway/blob/dev/templates/index.html where you can find: "https://maps.googleapis.com/maps/api/js?key=AIzaSyDUIWsBLkvIUwzLHMHos9qFebyJ63hEG2M&libraries=places,visualization&language=iw" (google maps url) +So, for example, if the developer key is "12345" the new url need to be is: "https://maps.googleapis.com/maps/api/js?key=12345&libraries=places,visualization&language=iw" **9.** To stop the containers run: `sudo docker-compose down`