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

Jump to bottom

[13] feat!: connect bento_public to WES for showing last ingest times #146

Merged
merged 7 commits into from
Aug 16, 2023
Merged

[13] feat!: connect bento_public to WES for showing last ingest times #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
12f9daa
Add environment variable for WES URL
noctillion Jun 22, 2023
85653d1
Add wes-net to public
noctillion Jun 22, 2023
eb3d734
Merge branch 'releases/v12.1' into features/last-ingestion-public
noctillion Jun 22, 2023
cef09b3
public 13.1
noctillion Jul 4, 2023
37cfaf1
Merge branch 'releases/v13' into features/last-ingestion-public
noctillion Jul 12, 2023
96b19c0
ordering env variable
noctillion Jul 26, 2023
abac03b
Merge branch 'releases/v13' into features/last-ingestion-public
noctillion Aug 1, 2023
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 etc/bento.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ BENTO_PUBLIC_DEBUG=false
BENTO_PUBLIC_SERVICE_ID=${BENTOV2_PREFIX}-public
BENTO_PUBLIC_CLIENT_NAME=BentoPublicDev
BENTO_PUBLIC_KATSU_URL=http://${BENTOV2_KATSU_CONTAINER_NAME}:${BENTOV2_KATSU_INTERNAL_PORT}
BENTO_PUBLIC_WES_URL=http://${BENTOV2_WES_CONTAINER_NAME}:${BENTOV2_WES_INTERNAL_PORT}
BENTO_PUBLIC_PORTAL_URL=${BENTOV2_PORTAL_PUBLIC_URL}
BENTO_PUBLIC_TRANSLATED=true

Expand Down
5 changes: 5 additions & 0 deletions lib/public/docker-compose.public.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ services:
networks:
- public-net # Bento Public, not a public network!
- katsu-net # Needs to talk to Katsu for public endpoint TODO: Should use public URL instead!
- wes-net # Needs to talk to WES for public endpoint TODO: Should use public URL instead!
environment:
- BENTO_UID
- BENTO_PUBLIC_SERVICE_ID
- BENTO_PUBLIC_CLIENT_NAME
- BENTO_PUBLIC_KATSU_URL
- BENTO_PUBLIC_WES_URL
- BENTO_PUBLIC_PORTAL_URL
- BENTO_PUBLIC_TRANSLATED
- BENTO_BEACON_UI_ENABLED
Expand Down Expand Up @@ -39,3 +41,6 @@ networks:
public-net:
external: true
name: ${BENTO_PUBLIC_NETWORK}
wes-net:
external: true
name: ${BENTO_WES_NETWORK}