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

Add env var #1270

Merged
merged 5 commits into from
Feb 3, 2025
Merged

Add env var #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf39513
Add env var
JoshuaSBrown Jan 31, 2025
714381f
Add change log comment
JoshuaSBrown Feb 1, 2025
840577a
Merge branch 'devel' into 1268-bug-foxx-docker-file-unbound-env-var
JoshuaSBrown Feb 3, 2025
68018f5
Add compose entries for foxx tests
JoshuaSBrown Feb 3, 2025
9516014
Merge branch 'devel' into 1268-bug-foxx-docker-file-unbound-env-var
JoshuaSBrown Feb 3, 2025
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: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
19. [1180] - Refactor of authz foxx module, split into objects and added unit tests
20. [1257] - Bug in authz library parsing of authz.conf file, globus paths incorrectly sanitized when using just '/'
21. [1255] - Fixes bug, in libauthz with log_path var not being read in from config file.
22. [1268] - Bug fixes unbound variable in foxx entrypoint file.
23. [1269] - Update Arangodb to 3.12.4

# v2024.6.17.10.40
Expand Down
3 changes: 3 additions & 0 deletions compose/all/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ services:
DATAFED_DATABASE_PASSWORD: "${DATAFED_DATABASE_PASSWORD}"
DATAFED_DATABASE_IP_ADDRESS: "${DATAFED_DATABASE_IP_ADDRESS}"
DATAFED_DATABASE_HOST: "arango"
# NOTE enabling foxx tests will cause state changes in the database
# do not run this unless you are ok with the database being wiped.
ENABLE_FOXX_TESTS: "${DATAFED_ENABLE_FOXX_TESTS}"
healthcheck:
test: ["CMD", "/bin/bash", "-c", "[ -f /tmp/.foxx_is_installed ]"]
interval: 10s
Expand Down
3 changes: 3 additions & 0 deletions compose/metadata/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ services:
DATAFED_DATABASE_PASSWORD: "${DATAFED_DATABASE_PASSWORD}"
DATAFED_DATABASE_IP_ADDRESS: "${DATAFED_DATABASE_IP_ADDRESS}"
DATAFED_DATABASE_HOST: "arango"
# NOTE enabling foxx tests will cause state changes in the database
# do not run this unless you are ok with the database being wiped.
ENABLE_FOXX_TESTS: "${DATAFED_ENABLE_FOXX_TESTS}"
healthcheck:
test: ["CMD", "/bin/bash", "-c", "[ -f /tmp/.foxx_is_installed ]"]
interval: 10s
Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile.foxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ ENV DATAFED_DIR="${DATAFED_DIR}"
ENV DATAFED_DEPENDENCIES_INSTALL_PATH="${DATAFED_DEPENDENCIES_INSTALL_PATH}"
ENV DATAFED_INSTALL_PATH="$DATAFED_INSTALL_PATH"
ENV DATAFED_DEFAULT_LOG_PATH="$DATAFED_INSTALL_PATH/logs"
# Set to false by default to avoid wiping the database
ENV ENABLE_FOXX_TESTS="FALSE"

COPY ./core/CMakeLists.txt ${BUILD_DIR}/core/CMakeLists.txt
COPY ./CMakeLists.txt ${BUILD_DIR}
Expand Down
8 changes: 8 additions & 0 deletions scripts/compose_generate_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,13 @@ else
local_DATAFED_COMPOSE_DATABASE_IP_ADDRESS=$(printenv DATAFED_COMPOSE_DATABASE_IP_ADDRESS)
fi

if [ -z "${DATAFED_ENABLE_FOXX_TESTS}" ]
then
local_DATAFED_ENABLE_FOXX_TESTS="FALSE"
else
local_DATAFED_ENABLE_FOXX_TESTS=$(printenv DATAFED_ENABLE_FOXX_TESTS)
fi

if [ -z "${DATAFED_COMPOSE_DATABASE_PORT}" ]
then
local_DATAFED_COMPOSE_DATABASE_PORT="8529"
Expand Down Expand Up @@ -292,6 +299,7 @@ DATAFED_WEB_KEY_PATH=/opt/datafed/keys/${local_DATAFED_WEB_KEY_NAME}
DATAFED_DATABASE_PASSWORD=${local_DATAFED_COMPOSE_DATABASE_PASSWORD}
DATAFED_DATABASE_IP_ADDRESS=${local_DATAFED_COMPOSE_DATABASE_IP_ADDRESS}
DATAFED_DATABASE_PORT=${local_DATAFED_COMPOSE_DATABASE_PORT}
DATAFED_ENABLE_FOXX_TESTS=${local_DATAFED_ENABLE_FOXX_TESTS}
EOF
fi

Expand Down