Skip to content

Commit

Permalink
Merge pull request #949 from ORNL/JoshuaSBrown-fixes-to-compose-build
Browse files Browse the repository at this point in the history
Hard code missing env variable
  • Loading branch information
JoshuaSBrown authored Apr 16, 2024
2 parents b4dd29d + ae944b8 commit 60fbeab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ You will also need the Globus python developer kit globus_sdk.
pip install globus_sdk
```

In addition, you will also need admin rights on the Globus subscription group.

### 4. Building Repo Services

The following command will build all the images to run the core metadata
Expand Down
8 changes: 4 additions & 4 deletions compose/compose_repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ services:
DATAFED_HTTPS_SERVER_PORT: "${DATAFED_HTTPS_SERVER_PORT}"
DATAFED_DEFAULT_LOG_PATH: "${DATAFED_CONTAINER_LOG_PATH}"
DATAFED_CORE_ADDRESS_PORT_INTERNAL: "${DATAFED_DOMAIN}:7513"
DATAFED_GCS_COLLECTION_ROOT_PATH: "${DATAFED_GCS_COLLECTION_ROOT_PATH}"
DATAFED_GCS_COLLECTION_ROOT_PATH: "/mnt/datafed"
UID: "${DATAFED_UID}"
HOST_HOSTNAME: "localhost"
image: datafed-repo:latest
volumes:
- ./keys:/opt/datafed/keys
- ./logs:${DATAFED_CONTAINER_LOG_PATH}
- ${DATAFED_HOST_COLLECTION_MOUNT}:${DATAFED_GCS_COLLECTION_ROOT_PATH}
- ${DATAFED_HOST_COLLECTION_MOUNT}:/mnt/datafed
ports:
- 9000:9000 # Communication core server

Expand All @@ -40,7 +40,7 @@ services:
DATAFED_REPO_ID_AND_DIR: "${DATAFED_REPO_ID_AND_DIR}"
DATAFED_GLOBUS_SUBSCRIPTION: "${DATAFED_GLOBUS_SUBSCRIPTION}"
DATAFED_GLOBUS_CONTROL_PORT: "${DATAFED_GLOBUS_CONTROL_PORT}"
DATAFED_GCS_COLLECTION_ROOT_PATH: "${DATAFED_GCS_COLLECTION_ROOT_PATH}"
DATAFED_GCS_COLLECTION_ROOT_PATH: "/mnt/datafed"
DATAFED_REPO_USER: "${DATAFED_REPO_USER}"
UID: "${DATAFED_UID}"
HOST_HOSTNAME: "localhost"
Expand All @@ -51,4 +51,4 @@ services:
- ./keys:/opt/datafed/keys
- ./globus:/opt/datafed/globus
- ./logs:${DATAFED_CONTAINER_LOG_PATH}
- ${DATAFED_HOST_COLLECTION_MOUNT}:${DATAFED_GCS_COLLECTION_ROOT_PATH}
- ${DATAFED_HOST_COLLECTION_MOUNT}:/mnt/datafed

0 comments on commit 60fbeab

Please sign in to comment.