Skip to content

Commit

Permalink
Merge pull request #2534 from data-for-change/dev
Browse files Browse the repository at this point in the history
merge dev into master
  • Loading branch information
atalyaalon authored Jan 4, 2024
2 parents 21a3cd8 + bb9eeda commit f7c9b96
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 0 additions & 2 deletions anyway/infographics_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ def get_request_params(
lang=lang,
news_flash_description=news_flash_description
)
logging.debug(f"Ending get_request_params. params: {request_params}")
return request_params


Expand All @@ -148,7 +147,6 @@ def create_infographics_data(news_flash_id, number_of_years_ago, lang: str) -> s


def create_infographics_data_for_location(vals: dict) -> str:
logger.debug(f"create_infographics_data_for_location({vals})")
try:
request_params = get_request_params_from_request_values(vals)
output = create_infographics_items(request_params)
Expand Down
10 changes: 8 additions & 2 deletions docs/DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,10 @@ This will start the containers. It will take a few minutes until it's done.
*notice*
The docker image, after copying the DB, will be around 20GB and defaultly on C: drive. If you don't have enough space, follow this instractions in order to move the docker image to a different drive - https://needlify.com/post/how-to-move-wsl-distributions-including-docker-images-to-new-locations-on-windows-6412384cbd14c

**8.** **You're all set!** ANYWAY is up and running with the DB data - connect to http://127.0.0.1:8080
**8.** (Optional) To free up disk space: Run `docker buildx prune -f`. This will clear the build cache.
To remove all unused artifacts Docker has produced, run `docker system prune -f`. This will remove all unused containers, images, networks, and build cache.

**9.** **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 contact atalya via slack 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)
Expand Down Expand Up @@ -111,7 +114,10 @@ Note - At some point you should gett the message "Waiting for postgres server, 4

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
**8.** (Optional) To free up disk space: Run `docker buildx prune -f`. This will clear the build cache.
To remove all unused artifacts Docker has produced, run `docker system prune -f`. This will remove all unused containers, images, networks, and build cache.

**9.** **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.
You now need to see the map for development, so contact us via email [[email protected]](mailto:[email protected]) 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)
Expand Down

0 comments on commit f7c9b96

Please sign in to comment.