Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 0 additions & 9 deletions deployment/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ SURFCONEXT_CLIENT_ID=kin-rpd-demo.com
SURFCONEXT_REDIRECT=https://ubuntu2204sudo.demo-nlesc.src.surf-hosted.nl/auth/login/surfconext
# consumed by: authentication, frontend/utils/loginHelpers
SURFCONEXT_WELL_KNOWN_URL=https://connect.test.surfconext.nl/.well-known/openid-configuration
# consumed by: authentication, frontend/utils/loginHelpers
SURFCONEXT_SCOPES=openid
# consumed by: frontend/utils/loginHelpers
SURFCONEXT_RESPONSE_MODE=form_post

# ORCID
# consumed by: authentication, frontend/utils/loginHelpers
Expand All @@ -107,11 +103,6 @@ AZURE_CLIENT_ID=
AZURE_REDIRECT=
# consumed by: authentication, frontend/utils/loginHelpers
AZURE_WELL_KNOWN_URL=
# consumed by: authentication, frontend/utils/loginHelpers
AZURE_SCOPES=openid+email+profile
# consumed by: authentication, frontend/utils/loginHelpers
AZURE_LOGIN_PROMPT=select_account
# consumed by: frontend
# the name displayed to users when multiple providers are configured
AZURE_DISPLAY_NAME="Microsoft Azure AD"
# consumed by: frontend
Expand Down
42 changes: 14 additions & 28 deletions deployment/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
services:
database:
container_name: database
image: ghcr.io/research-software-directory/rsd-saas/database:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/database:v3.4.1
expose:
- 5432
environment:
Expand All @@ -25,7 +25,7 @@ services:

backend:
container_name: backend
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.4.1
expose:
- 3500
environment:
Expand All @@ -43,7 +43,7 @@ services:

auth:
container_name: auth
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.4.1
expose:
- 7000
environment:
Expand All @@ -59,6 +59,7 @@ services:
- HELMHOLTZID_REDIRECT
- HELMHOLTZID_WELL_KNOWN_URL
- HELMHOLTZID_SCOPES
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
- ORCID_CLIENT_ID
- ORCID_REDIRECT
- ORCID_REDIRECT_COUPLE
Expand All @@ -67,11 +68,12 @@ services:
- AZURE_REDIRECT
- AZURE_WELL_KNOWN_URL
- AZURE_ORGANISATION
- AZURE_DISPLAY_NAME
- AZURE_DESCRIPTION_HTML
- LINKEDIN_CLIENT_ID
- LINKEDIN_REDIRECT
- LINKEDIN_REDIRECT_COUPLE
- LINKEDIN_WELL_KNOWN_URL
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
- AUTH_SURFCONEXT_CLIENT_SECRET
- AUTH_HELMHOLTZID_CLIENT_SECRET
- AUTH_ORCID_CLIENT_SECRET
Expand All @@ -87,7 +89,7 @@ services:

scrapers:
container_name: scrapers
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.4.1
environment:
# it uses values from .env file
- POSTGREST_URL
Expand All @@ -108,7 +110,7 @@ services:
restart: unless-stopped

background-services:
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.4.1
environment:
# it uses values from .env file
- POSTGRES_DB_HOST
Expand All @@ -125,42 +127,26 @@ services:
container_name: frontend
image: ghcr.io/research-software-directory/kin-rpd/frontend:latest
environment:
# it uses values from .env file
# it uses values from .env file
- POSTGREST_URL
- PGRST_JWT_SECRET
- RSD_AUTH_URL
- RSD_AUTH_PROVIDERS
- RSD_AUTH_COUPLE_PROVIDERS
- RSD_REVERSE_PROXY_URL
- RSD_AUTH_URL
- CROSSREF_CONTACT_EMAIL
- MATOMO_URL
- MATOMO_ID
- SURFCONEXT_CLIENT_ID
- SURFCONEXT_REDIRECT
- SURFCONEXT_WELL_KNOWN_URL
- SURFCONEXT_SCOPES
- SURFCONEXT_RESPONSE_MODE
- HELMHOLTZID_CLIENT_ID
- HELMHOLTZID_REDIRECT
- HELMHOLTZID_WELL_KNOWN_URL
- HELMHOLTZID_SCOPES
- HELMHOLTZID_RESPONSE_MODE
# link your orcid account
- RSD_AUTH_COUPLE_PROVIDERS
- ORCID_CLIENT_ID
- ORCID_REDIRECT
- ORCID_REDIRECT_COUPLE
- ORCID_WELL_KNOWN_URL
- ORCID_SCOPES
- AZURE_CLIENT_ID
- AZURE_REDIRECT
- AZURE_WELL_KNOWN_URL
- AZURE_SCOPES
- AZURE_LOGIN_PROMPT
- AZURE_DISPLAY_NAME
- AZURE_DESCRIPTION_HTML
# link your linkedin account
- LINKEDIN_CLIENT_ID
- LINKEDIN_REDIRECT
- LINKEDIN_REDIRECT_COUPLE
- LINKEDIN_WELL_KNOWN_URL
- CROSSREF_CONTACT_EMAIL
expose:
- 3000
depends_on:
Expand Down
40 changes: 13 additions & 27 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

services:
database:
image: ghcr.io/research-software-directory/rsd-saas/database:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/database:v3.4.1
ports:
# enable connection from outside (development mode)
- "5432:5432"
Expand All @@ -23,7 +23,7 @@ services:
- net

backend:
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.4.1
expose:
- 3500
environment:
Expand All @@ -39,7 +39,7 @@ services:
- net

auth:
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.4.1
ports:
- 5005:5005
expose:
Expand All @@ -57,6 +57,7 @@ services:
- HELMHOLTZID_REDIRECT
- HELMHOLTZID_WELL_KNOWN_URL
- HELMHOLTZID_SCOPES
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
- ORCID_CLIENT_ID
- ORCID_REDIRECT
- ORCID_REDIRECT_COUPLE
Expand All @@ -65,11 +66,12 @@ services:
- AZURE_REDIRECT
- AZURE_WELL_KNOWN_URL
- AZURE_ORGANISATION
- AZURE_DISPLAY_NAME
- AZURE_DESCRIPTION_HTML
- LINKEDIN_CLIENT_ID
- LINKEDIN_REDIRECT
- LINKEDIN_REDIRECT_COUPLE
- LINKEDIN_WELL_KNOWN_URL
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
- AUTH_SURFCONEXT_CLIENT_SECRET
- AUTH_HELMHOLTZID_CLIENT_SECRET
- AUTH_ORCID_CLIENT_SECRET
Expand All @@ -90,7 +92,7 @@ services:
]

scrapers:
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.4.1
environment:
# it uses values from .env file
- POSTGREST_URL
Expand All @@ -110,7 +112,7 @@ services:
- net

background-services:
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.3.0
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.4.1
environment:
# it uses values from .env file
- POSTGRES_DB_HOST
Expand All @@ -134,39 +136,23 @@ services:
# it uses values from .env file
- POSTGREST_URL
- PGRST_JWT_SECRET
- RSD_AUTH_URL
- RSD_AUTH_PROVIDERS
- RSD_AUTH_COUPLE_PROVIDERS
- RSD_REVERSE_PROXY_URL
- RSD_AUTH_URL
- CROSSREF_CONTACT_EMAIL
- MATOMO_URL
- MATOMO_ID
- SURFCONEXT_CLIENT_ID
- SURFCONEXT_REDIRECT
- SURFCONEXT_WELL_KNOWN_URL
- SURFCONEXT_SCOPES
- SURFCONEXT_RESPONSE_MODE
- HELMHOLTZID_CLIENT_ID
- HELMHOLTZID_REDIRECT
- HELMHOLTZID_WELL_KNOWN_URL
- HELMHOLTZID_SCOPES
- HELMHOLTZID_RESPONSE_MODE
# link your orcid account
- RSD_AUTH_COUPLE_PROVIDERS
- ORCID_CLIENT_ID
- ORCID_REDIRECT
- ORCID_REDIRECT_COUPLE
- ORCID_WELL_KNOWN_URL
- ORCID_SCOPES
- AZURE_CLIENT_ID
- AZURE_REDIRECT
- AZURE_WELL_KNOWN_URL
- AZURE_SCOPES
- AZURE_LOGIN_PROMPT
- AZURE_DISPLAY_NAME
- AZURE_DESCRIPTION_HTML
# link your linkedin account
- LINKEDIN_CLIENT_ID
- LINKEDIN_REDIRECT
- LINKEDIN_REDIRECT_COUPLE
- LINKEDIN_WELL_KNOWN_URL
- CROSSREF_CONTACT_EMAIL
expose:
- 3000
depends_on:
Expand Down
Loading