From 12f9daa7611bfa6db08fee41cfd0441dd34689fe Mon Sep 17 00:00:00 2001 From: Julian Date: Thu, 22 Jun 2023 00:45:23 -0400 Subject: [PATCH 1/4] Add environment variable for WES URL --- etc/bento.env | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/bento.env b/etc/bento.env index 882aa11a..d24ba8f9 100644 --- a/etc/bento.env +++ b/etc/bento.env @@ -363,6 +363,8 @@ BENTO_PUBLIC_PORTAL_URL=${BENTOV2_PORTAL_PUBLIC_URL} BENTO_PUBLIC_MAX_QUERY_PARAMETERS=2 BENTO_PUBLIC_TRANSLATED=true +BENTO_PUBLIC_WES_URL=http://${BENTOV2_WES_CONTAINER_NAME}:${BENTOV2_WES_INTERNAL_PORT} + # Beacon BENTO_BEACON_DEBUG=true BENTO_BEACON_CONTAINER_NAME=${BENTOV2_PREFIX}-beacon From 85653d11613d28cf610e2a9cb51d6dd350b38082 Mon Sep 17 00:00:00 2001 From: Julian Date: Thu, 22 Jun 2023 00:46:01 -0400 Subject: [PATCH 2/4] Add wes-net to public --- lib/public/docker-compose.public.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/public/docker-compose.public.yaml b/lib/public/docker-compose.public.yaml index d70b0f4d..7fd15c75 100644 --- a/lib/public/docker-compose.public.yaml +++ b/lib/public/docker-compose.public.yaml @@ -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_MAX_QUERY_PARAMETERS - BENTO_PUBLIC_PORTAL_URL - BENTO_PUBLIC_TRANSLATED @@ -40,3 +42,6 @@ networks: public-net: external: true name: ${BENTO_PUBLIC_NETWORK} + wes-net: + external: true + name: ${BENTO_WES_NETWORK} From cef09b32da1c3a096178d58ead9ff49c723d5bde Mon Sep 17 00:00:00 2001 From: Julian Date: Tue, 4 Jul 2023 17:03:22 -0400 Subject: [PATCH 3/4] public 13.1 --- etc/bento.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/bento.env b/etc/bento.env index 328ed510..1a0561f4 100644 --- a/etc/bento.env +++ b/etc/bento.env @@ -346,7 +346,7 @@ BENTOV2_GOHAN_PRIVATE_AUTHZ_URL=http://${BENTOV2_GOHAN_AUTHZ_OPA_CONTAINER_NAME} # Bento-Public BENTO_PUBLIC_IMAGE=ghcr.io/bento-platform/bento_public -BENTO_PUBLIC_VERSION=0.13.0 +BENTO_PUBLIC_VERSION=0.13.1 BENTO_PUBLIC_VERSION_DEV=${BENTO_PUBLIC_VERSION}-dev BENTO_PUBLIC_CONTAINER_NAME=${BENTOV2_PREFIX}-public BENTO_PUBLIC_NETWORK=${BENTOV2_PREFIX}-public-net From 96b19c07cb0d6474579d923cb9ae5750c1e296a3 Mon Sep 17 00:00:00 2001 From: Julian Date: Wed, 26 Jul 2023 11:22:42 -0400 Subject: [PATCH 4/4] ordering env variable --- etc/bento.env | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/bento.env b/etc/bento.env index 5f0321d2..c87375ec 100644 --- a/etc/bento.env +++ b/etc/bento.env @@ -358,12 +358,11 @@ 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_MAX_QUERY_PARAMETERS=2 BENTO_PUBLIC_TRANSLATED=true -BENTO_PUBLIC_WES_URL=http://${BENTOV2_WES_CONTAINER_NAME}:${BENTOV2_WES_INTERNAL_PORT} - # Beacon BENTO_BEACON_CONTAINER_NAME=${BENTOV2_PREFIX}-beacon BENTO_BEACON_NETWORK=${BENTOV2_PREFIX}-beacon-net