From cc651948ecd7949fbe04ba985b45fdb71fc756cd Mon Sep 17 00:00:00 2001 From: Kara Moscoe Date: Wed, 20 Nov 2024 15:07:32 -0800 Subject: [PATCH 1/2] add data docker to prebuilt images --- custom_dc/build_image.md | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/custom_dc/build_image.md b/custom_dc/build_image.md index 75fb7ff15..6ee4ba7a7 100644 --- a/custom_dc/build_image.md +++ b/custom_dc/build_image.md @@ -18,8 +18,8 @@ While you are just testing out data changes, you don't need to build the website Data Commons provides two prebuilt images in the Google Artifact Registry that you can download to run in a Docker container: -- `gcr.io/datcom-ci/datacommons-services:stable`. This is a tested, stable version but may be several weeks old. -- `gcr.io/datcom-ci/datacommons-services:latest`. This is the latest version built from head. +- `gcr.io/datcom-ci/datacommons-data:stable` and `gcr.io/datcom-ci/datacommons-services:stable`. This is a tested, stable version but may be several weeks old. +- `gcr.io/datcom-ci/datacommons-data:latest` and `gcr.io/datcom-ci/datacommons-services:latest`. This is the latest version built from head. If you want to pick up the latest prebuilt version, do the following: @@ -27,18 +27,26 @@ If you want to pick up the latest prebuilt version, do the following: ```shell docker pull gcr.io/datcom-ci/datacommons-services:latest + docker pull gcr.io/datcom-ci/datacommons-data:latest + ``` -1. Rerun the container, specifying that repo as the argument to the `docker run` command: +1. Rerun the data container, specifying that repo specifying that repo as the argument to the `docker run` command: + 
docker run \
+   --env-file $PWD/custom_dc/env.list \
+   -v INPUT_DIRECTORY:INPUT_DIRECTORY \
+   -v OUTPUT_DIRECTORY:OUTPUT_DIRECTORY \
+   gcr.io/datcom-ci/datacommons-data:latest
+
- ```shell - docker run -it \ +1. Restart the services container: + 
docker run -it \
    -p 8080:8080 \
    -e DEBUG=true \
    --env-file $PWD/custom_dc/env.list \
    -v INPUT_DIRECTORY:INPUT_DIRECTORY \
    -v OUTPUT_DIRECTORY:OUTPUT_DIRECTORY \
    gcr.io/datcom-ci/datacommons-services:latest
-   ```
+
## Build a local image {#build-repo} You will need to build a local image in any of the following cases: From fcdfb8dbee95eb29e05086f9be13a89932bea59f Mon Sep 17 00:00:00 2001 From: Kara Moscoe Date: Wed, 20 Nov 2024 16:31:55 -0800 Subject: [PATCH 2/2] grammar fix --- custom_dc/build_image.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/custom_dc/build_image.md b/custom_dc/build_image.md index 6ee4ba7a7..55f1bfe6c 100644 --- a/custom_dc/build_image.md +++ b/custom_dc/build_image.md @@ -18,18 +18,17 @@ While you are just testing out data changes, you don't need to build the website Data Commons provides two prebuilt images in the Google Artifact Registry that you can download to run in a Docker container: -- `gcr.io/datcom-ci/datacommons-data:stable` and `gcr.io/datcom-ci/datacommons-services:stable`. This is a tested, stable version but may be several weeks old. -- `gcr.io/datcom-ci/datacommons-data:latest` and `gcr.io/datcom-ci/datacommons-services:latest`. This is the latest version built from head. +- `gcr.io/datcom-ci/datacommons-data:stable` and `gcr.io/datcom-ci/datacommons-services:stable`. These are tested, stable versions but may be several weeks old. +- `gcr.io/datcom-ci/datacommons-data:latest` and `gcr.io/datcom-ci/datacommons-services:latest`. These are the latest versions built from head. If you want to pick up the latest prebuilt version, do the following: 1. From the root directory (e.g. `website`), run the following command: - ```shell docker pull gcr.io/datcom-ci/datacommons-services:latest docker pull gcr.io/datcom-ci/datacommons-data:latest - ``` + 1. Rerun the data container, specifying that repo specifying that repo as the argument to the `docker run` command: 
docker run \
    --env-file $PWD/custom_dc/env.list \