From dd487d83f3718033dc0740e496f7225c0ac07a0f Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Thu, 6 May 2021 15:33:12 -0700 Subject: [PATCH 1/3] Update front-end dev docs --- docs/frontend_development.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/frontend_development.md b/docs/frontend_development.md index fbabad0..d49d6ad 100644 --- a/docs/frontend_development.md +++ b/docs/frontend_development.md @@ -98,6 +98,10 @@ Note that these images aren't very useful at this point. Each frontend will extend and customize these images as necessary to replicate the server's environment for that frontend. +To work with the new Python server, you will need the new image specified +[here](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/dev/docker/python/Dockerfile). See the [CI recipe](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/.github/workflows/ci.yaml#L54) for the latest instructions +on how to build, test, and run locally. + # test After the images specific to your frontend have been built, you're ready to From d87719f35c90ea506e7109d769d3961d49c58ed3 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Fri, 7 May 2021 15:28:17 -0700 Subject: [PATCH 2/3] Docs: add link to the Flask server Dockerfile --- docs/frontend_development.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/frontend_development.md b/docs/frontend_development.md index d49d6ad..fb9bd13 100644 --- a/docs/frontend_development.md +++ b/docs/frontend_development.md @@ -98,8 +98,11 @@ Note that these images aren't very useful at this point. Each frontend will extend and customize these images as necessary to replicate the server's environment for that frontend. -To work with the new Python server, you will need the new image specified -[here](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/dev/docker/python/Dockerfile). See the [CI recipe](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/.github/workflows/ci.yaml#L54) for the latest instructions +To work with the new Python server, you will need the new Python image specified +[here](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/dev/docker/python/Dockerfile) +and replace the `delph_epidata_web` image with the image here +[here](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/devops/Dockerfile). +See the [CI recipe](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/.github/workflows/ci.yaml#L54) for the latest instructions on how to build, test, and run locally. # test From 68f7e19fd7999b479fc73e1551a5de014f70ecd9 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Wed, 12 May 2021 13:27:31 -0700 Subject: [PATCH 3/3] Update docs/frontend_development.md Co-authored-by: Katie Mazaitis --- docs/frontend_development.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/frontend_development.md b/docs/frontend_development.md index fb9bd13..32a2fd3 100644 --- a/docs/frontend_development.md +++ b/docs/frontend_development.md @@ -98,10 +98,12 @@ Note that these images aren't very useful at this point. Each frontend will extend and customize these images as necessary to replicate the server's environment for that frontend. -To work with the new Python server, you will need the new Python image specified -[here](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/dev/docker/python/Dockerfile) -and replace the `delph_epidata_web` image with the image here -[here](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/devops/Dockerfile). +The below was written before we switched the delphi-epidata API server to Python/Flask. +If you are following this guide in order to develop on delphi-epidata, you should build +[this Python image](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/dev/docker/python/Dockerfile) +as `delphi_web_python` and use it in place of `delphi_python`, and use +[this web image](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/devops/Dockerfile) +for `delphi_epidata_web`. See the [CI recipe](https://github.com/cmu-delphi/delphi-epidata/blob/76cc4c513fe1fa64eede08a6a9202aaa25e0dc1b/.github/workflows/ci.yaml#L54) for the latest instructions on how to build, test, and run locally.