Skip to content

Commit 63c96a3

Browse files
committed
feat: upgrade to v3.4.1 and add news to module of settings.json
1 parent 8b915e8 commit 63c96a3

File tree

88 files changed

+1342
-1021
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1342
-1021
lines changed

deployment/.env.example

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@ SURFCONEXT_CLIENT_ID=kin-rpd-demo.com
8181
SURFCONEXT_REDIRECT=https://ubuntu2204sudo.demo-nlesc.src.surf-hosted.nl/auth/login/surfconext
8282
# consumed by: authentication, frontend/utils/loginHelpers
8383
SURFCONEXT_WELL_KNOWN_URL=https://connect.test.surfconext.nl/.well-known/openid-configuration
84-
# consumed by: authentication, frontend/utils/loginHelpers
85-
SURFCONEXT_SCOPES=openid
86-
# consumed by: frontend/utils/loginHelpers
87-
SURFCONEXT_RESPONSE_MODE=form_post
8884

8985
# ORCID
9086
# consumed by: authentication, frontend/utils/loginHelpers
@@ -107,11 +103,6 @@ AZURE_CLIENT_ID=
107103
AZURE_REDIRECT=
108104
# consumed by: authentication, frontend/utils/loginHelpers
109105
AZURE_WELL_KNOWN_URL=
110-
# consumed by: authentication, frontend/utils/loginHelpers
111-
AZURE_SCOPES=openid+email+profile
112-
# consumed by: authentication, frontend/utils/loginHelpers
113-
AZURE_LOGIN_PROMPT=select_account
114-
# consumed by: frontend
115106
# the name displayed to users when multiple providers are configured
116107
AZURE_DISPLAY_NAME="Microsoft Azure AD"
117108
# consumed by: frontend

deployment/docker-compose.yml

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
services:
66
database:
77
container_name: database
8-
image: ghcr.io/research-software-directory/rsd-saas/database:v3.3.0
8+
image: ghcr.io/research-software-directory/rsd-saas/database:v3.4.1
99
expose:
1010
- 5432
1111
environment:
@@ -25,7 +25,7 @@ services:
2525

2626
backend:
2727
container_name: backend
28-
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.3.0
28+
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.4.1
2929
expose:
3030
- 3500
3131
environment:
@@ -43,7 +43,7 @@ services:
4343

4444
auth:
4545
container_name: auth
46-
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.3.0
46+
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.4.1
4747
expose:
4848
- 7000
4949
environment:
@@ -59,6 +59,7 @@ services:
5959
- HELMHOLTZID_REDIRECT
6060
- HELMHOLTZID_WELL_KNOWN_URL
6161
- HELMHOLTZID_SCOPES
62+
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
6263
- ORCID_CLIENT_ID
6364
- ORCID_REDIRECT
6465
- ORCID_REDIRECT_COUPLE
@@ -67,11 +68,12 @@ services:
6768
- AZURE_REDIRECT
6869
- AZURE_WELL_KNOWN_URL
6970
- AZURE_ORGANISATION
71+
- AZURE_DISPLAY_NAME
72+
- AZURE_DESCRIPTION_HTML
7073
- LINKEDIN_CLIENT_ID
7174
- LINKEDIN_REDIRECT
7275
- LINKEDIN_REDIRECT_COUPLE
7376
- LINKEDIN_WELL_KNOWN_URL
74-
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
7577
- AUTH_SURFCONEXT_CLIENT_SECRET
7678
- AUTH_HELMHOLTZID_CLIENT_SECRET
7779
- AUTH_ORCID_CLIENT_SECRET
@@ -87,7 +89,7 @@ services:
8789

8890
scrapers:
8991
container_name: scrapers
90-
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.3.0
92+
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.4.1
9193
environment:
9294
# it uses values from .env file
9395
- POSTGREST_URL
@@ -108,7 +110,7 @@ services:
108110
restart: unless-stopped
109111

110112
background-services:
111-
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.3.0
113+
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.4.1
112114
environment:
113115
# it uses values from .env file
114116
- POSTGRES_DB_HOST
@@ -125,42 +127,26 @@ services:
125127
container_name: frontend
126128
image: ghcr.io/research-software-directory/kin-rpd/frontend:latest
127129
environment:
128-
# it uses values from .env file
130+
# it uses values from .env file
129131
- POSTGREST_URL
130132
- PGRST_JWT_SECRET
131-
- RSD_AUTH_URL
132-
- RSD_AUTH_PROVIDERS
133-
- RSD_AUTH_COUPLE_PROVIDERS
134133
- RSD_REVERSE_PROXY_URL
134+
- RSD_AUTH_URL
135+
- CROSSREF_CONTACT_EMAIL
135136
- MATOMO_URL
136137
- MATOMO_ID
137-
- SURFCONEXT_CLIENT_ID
138-
- SURFCONEXT_REDIRECT
139-
- SURFCONEXT_WELL_KNOWN_URL
140-
- SURFCONEXT_SCOPES
141-
- SURFCONEXT_RESPONSE_MODE
142-
- HELMHOLTZID_CLIENT_ID
143-
- HELMHOLTZID_REDIRECT
144-
- HELMHOLTZID_WELL_KNOWN_URL
145-
- HELMHOLTZID_SCOPES
146-
- HELMHOLTZID_RESPONSE_MODE
138+
# link your orcid account
139+
- RSD_AUTH_COUPLE_PROVIDERS
147140
- ORCID_CLIENT_ID
148141
- ORCID_REDIRECT
149142
- ORCID_REDIRECT_COUPLE
150143
- ORCID_WELL_KNOWN_URL
151144
- ORCID_SCOPES
152-
- AZURE_CLIENT_ID
153-
- AZURE_REDIRECT
154-
- AZURE_WELL_KNOWN_URL
155-
- AZURE_SCOPES
156-
- AZURE_LOGIN_PROMPT
157-
- AZURE_DISPLAY_NAME
158-
- AZURE_DESCRIPTION_HTML
145+
# link your linkedin account
159146
- LINKEDIN_CLIENT_ID
160147
- LINKEDIN_REDIRECT
161148
- LINKEDIN_REDIRECT_COUPLE
162149
- LINKEDIN_WELL_KNOWN_URL
163-
- CROSSREF_CONTACT_EMAIL
164150
expose:
165151
- 3000
166152
depends_on:

docker-compose.yml

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
services:
66
database:
7-
image: ghcr.io/research-software-directory/rsd-saas/database:v3.3.0
7+
image: ghcr.io/research-software-directory/rsd-saas/database:v3.4.1
88
ports:
99
# enable connection from outside (development mode)
1010
- "5432:5432"
@@ -23,7 +23,7 @@ services:
2323
- net
2424

2525
backend:
26-
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.3.0
26+
image: ghcr.io/research-software-directory/rsd-saas/backend:v3.4.1
2727
expose:
2828
- 3500
2929
environment:
@@ -39,7 +39,7 @@ services:
3939
- net
4040

4141
auth:
42-
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.3.0
42+
image: ghcr.io/research-software-directory/rsd-saas/auth:v3.4.1
4343
ports:
4444
- 5005:5005
4545
expose:
@@ -57,6 +57,7 @@ services:
5757
- HELMHOLTZID_REDIRECT
5858
- HELMHOLTZID_WELL_KNOWN_URL
5959
- HELMHOLTZID_SCOPES
60+
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
6061
- ORCID_CLIENT_ID
6162
- ORCID_REDIRECT
6263
- ORCID_REDIRECT_COUPLE
@@ -65,11 +66,12 @@ services:
6566
- AZURE_REDIRECT
6667
- AZURE_WELL_KNOWN_URL
6768
- AZURE_ORGANISATION
69+
- AZURE_DISPLAY_NAME
70+
- AZURE_DESCRIPTION_HTML
6871
- LINKEDIN_CLIENT_ID
6972
- LINKEDIN_REDIRECT
7073
- LINKEDIN_REDIRECT_COUPLE
7174
- LINKEDIN_WELL_KNOWN_URL
72-
- HELMHOLTZID_ALLOW_EXTERNAL_USERS
7375
- AUTH_SURFCONEXT_CLIENT_SECRET
7476
- AUTH_HELMHOLTZID_CLIENT_SECRET
7577
- AUTH_ORCID_CLIENT_SECRET
@@ -90,7 +92,7 @@ services:
9092
]
9193

9294
scrapers:
93-
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.3.0
95+
image: ghcr.io/research-software-directory/rsd-saas/scrapers:v3.4.1
9496
environment:
9597
# it uses values from .env file
9698
- POSTGREST_URL
@@ -110,7 +112,7 @@ services:
110112
- net
111113

112114
background-services:
113-
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.3.0
115+
image: ghcr.io/research-software-directory/rsd-saas/background-services:v3.4.1
114116
environment:
115117
# it uses values from .env file
116118
- POSTGRES_DB_HOST
@@ -134,39 +136,23 @@ services:
134136
# it uses values from .env file
135137
- POSTGREST_URL
136138
- PGRST_JWT_SECRET
137-
- RSD_AUTH_URL
138-
- RSD_AUTH_PROVIDERS
139-
- RSD_AUTH_COUPLE_PROVIDERS
140139
- RSD_REVERSE_PROXY_URL
140+
- RSD_AUTH_URL
141+
- CROSSREF_CONTACT_EMAIL
141142
- MATOMO_URL
142143
- MATOMO_ID
143-
- SURFCONEXT_CLIENT_ID
144-
- SURFCONEXT_REDIRECT
145-
- SURFCONEXT_WELL_KNOWN_URL
146-
- SURFCONEXT_SCOPES
147-
- SURFCONEXT_RESPONSE_MODE
148-
- HELMHOLTZID_CLIENT_ID
149-
- HELMHOLTZID_REDIRECT
150-
- HELMHOLTZID_WELL_KNOWN_URL
151-
- HELMHOLTZID_SCOPES
152-
- HELMHOLTZID_RESPONSE_MODE
144+
# link your orcid account
145+
- RSD_AUTH_COUPLE_PROVIDERS
153146
- ORCID_CLIENT_ID
154147
- ORCID_REDIRECT
155148
- ORCID_REDIRECT_COUPLE
156149
- ORCID_WELL_KNOWN_URL
157150
- ORCID_SCOPES
158-
- AZURE_CLIENT_ID
159-
- AZURE_REDIRECT
160-
- AZURE_WELL_KNOWN_URL
161-
- AZURE_SCOPES
162-
- AZURE_LOGIN_PROMPT
163-
- AZURE_DISPLAY_NAME
164-
- AZURE_DESCRIPTION_HTML
151+
# link your linkedin account
165152
- LINKEDIN_CLIENT_ID
166153
- LINKEDIN_REDIRECT
167154
- LINKEDIN_REDIRECT_COUPLE
168155
- LINKEDIN_WELL_KNOWN_URL
169-
- CROSSREF_CONTACT_EMAIL
170156
expose:
171157
- 3000
172158
depends_on:

0 commit comments

Comments
 (0)