Install infra-requirements.txt in images subdirs.

This accounts for both datahub and dev-r, and un-special-cases datahub.
berkeley-dsep-infra · Oct 3, 2023 · 77d598a · 77d598a
1 parent fe775f9
commit 77d598a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 138 deletions.
diff --git a/deployments/dev-r/images/secondary/Dockerfile- b/deployments/dev-r/images/secondary/Dockerfile-
diff --git a/scripts/infra-packages/sync.bash b/scripts/infra-packages/sync.bash
@@ -4,7 +4,12 @@ set -euxo pipefail
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 ROOT_DIR="${SCRIPT_DIR}/../.."
 
-find "${ROOT_DIR}/deployments" -type d -name 'image' -exec cp "${SCRIPT_DIR}/requirements.txt" {}/infra-requirements.txt \;
+# install file in deployment directories named "image"
+find "${ROOT_DIR}/deployments" -type d -name 'image' \
+	-exec echo cp "${SCRIPT_DIR}/requirements.txt" {}/infra-requirements.txt \;
 
-# FIXME: Don't specialcase datahub!
-cp ${SCRIPT_DIR}/requirements.txt ${ROOT_DIR}/deployments/datahub/images/default/infra-requirements.txt
+# install file in subdirectories of deployment directories named "images"
+for d in $(find "${ROOT_DIR}/deployments" -type d -name images); do
+	find $d -not -name images -maxdepth 1 -type d \
+		-exec echo cp "${SCRIPT_DIR}/requirements.txt" {}/infra-requirements.txt \;
+done