Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Dec 6, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
baefc7e
remove references to database docker definition in delphi/operations
melange396 Oct 10, 2022
421b9da
update Dockerfile comment with reference to required Dockerfile from …
melange396 Oct 10, 2022
65bd5da
remove references to database docker definition in delphi/operations
melange396 Oct 10, 2022
c9e896b
update Dockerfile comment with reference to required Dockerfile from …
melange396 Oct 10, 2022
f8654e9
Merge branch 'rm_operations_database_docker' of github.com:cmu-delphi…
melange396 Oct 10, 2022
e32fd2f
Merge branch 'dev' into rm_operations_database_docker
melange396 Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/database/epidata/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions dev/docker/database/epidata/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
2 changes: 1 addition & 1 deletion dev/docker/python/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 1 addition & 5 deletions dev/local/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

til: lifehack! productivity +100% 👍


@# Run the web server
@docker run --rm -p 127.0.0.1:10080:80 \
Expand All @@ -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 .
Expand Down
4 changes: 2 additions & 2 deletions docs/epidata_development.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 0 additions & 2 deletions docs/new_endpoint_tutorial.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down