remove dependence on and references to db docker definition in delphi/operations repo (#1000)

* remove references to database docker definition in delphi/operations
* some documentation updates

Author: melange396

.github/workflows/ci.yaml

@@ -51,7 +51,6 @@ jobs:
 
       - name: Build docker images
         run: |
-          docker build -t delphi_database -f repos/delphi/operations/dev/docker/database/Dockerfile .
           docker build -t delphi_python -f repos/delphi/operations/dev/docker/python/Dockerfile .
           docker build -t delphi_database_epidata -f ./repos/delphi/delphi-epidata/dev/docker/database/epidata/Dockerfile .
           docker build -t delphi_web_python -f repos/delphi/delphi-epidata/dev/docker/python/Dockerfile .

dev/docker/database/epidata/Dockerfile

@@ -13,7 +13,7 @@ ENV MYSQL_ROOT_PASSWORD pass
 # create the `epidata` database
 ENV MYSQL_DATABASE epidata
 
-# create the `epi` user account with a development-only password
+# create the `user` account with a development-only password
 ENV MYSQL_USER user
 ENV MYSQL_PASSWORD pass
 

dev/docker/database/epidata/README.md

@@ -1,10 +1,10 @@
 # `delphi_database_epidata`
 
-This image extends Delphi's database by:
+This image extends a Percona database by:
 
-- adding the `epi` user account
-- adding the `epidata` database
-- creating empty tables in `epidata`
+- adding the `user` account
+- adding the `epidata` &  other appropriate databases
+- creating empty tables in those databases
 
 To start a container from this image, run:
 

dev/docker/python/Dockerfile

@@ -1,4 +1,4 @@
-# start with the `delphi_python` image
+# start with the `delphi_python` image, which is built from repos/delphi/operations/dev/docker/python/Dockerfile
 FROM delphi_python
 
 RUN pip install --no-cache-dir -r repos/delphi/delphi-epidata/requirements.txt -r repos/delphi/delphi-epidata/requirements.dev.txt

dev/local/Makefile

@@ -78,7 +78,7 @@ web:
 	@# Build the web_epidata image
 	@cd repos/delphi/delphi-epidata;\
 		docker build -t delphi_web_epidata -f ./devops/Dockerfile .;\
-		cd ../../../
+		cd -
 
 	@# Run the web server
 	@docker run --rm -p 127.0.0.1:10080:80 \
@@ -97,10 +97,6 @@ db:
 	@# Setup virtual network if it doesn't exist
 	@docker network ls | grep delphi-net || docker network create --driver bridge delphi-net
 
-	@# Only build prereqs if we need them
-	@docker images delphi_database | grep delphi || \
-		docker build -t delphi_database -f repos/delphi/operations/dev/docker/database/Dockerfile .
-
 	@# Build the database_epidata image
 	@docker build -t delphi_database_epidata \
 		-f repos/delphi/delphi-epidata/dev/docker/database/epidata/Dockerfile .

docs/epidata_development.md

@@ -119,8 +119,8 @@ above. The base images are built first, followed by the derived
   the Epidata API to the `delphi_web` image.
 - The
   [`delphi_database_epidata` image](https://github.com/cmu-delphi/delphi-epidata/blob/main/dev/docker/database/epidata/README.md)
-  adds the `epi` user account, `epidata` database, and relevant tables
-  (initially empty) to the `delphi_database` image.
+  adds user accounts, `epidata` & other appropriate databases, and relevant tables
+  (initially empty) to a Percona database image.
 
 From the root of your workspace, all of the images can be built as follows:
 

docs/new_endpoint_tutorial.md

@@ -277,8 +277,6 @@ docker build -t delphi_web \
   -f repos/delphi/operations/dev/docker/web/Dockerfile .
 docker build -t delphi_web_epidata \
   -f repos/delphi/delphi-epidata/dev/docker/web/epidata/Dockerfile .
-docker build -t delphi_database \
-  -f repos/delphi/operations/dev/docker/database/Dockerfile .
 docker build -t delphi_database_epidata \
   -f repos/delphi/delphi-epidata/dev/docker/database/epidata/Dockerfile .