Skip to content

Commit 39b4ac5

Browse files
committed
Small fixes
1 parent 261a4b2 commit 39b4ac5

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/node_modules/
22
/build/
3+
/.env
34
/organoid-dashboard.priv.pem
45
/root.crt.pem
5-
/public_key.pem

docker-compose.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ services:
2424
- OAUTH2_PROXY_CLIENT_ID=${OAUTH_CLIENT_ID}
2525
- OAUTH2_PROXY_CLIENT_SECRET=${OAUTH_CLIENT_SECRET}
2626
- OAUTH2_PROXY_COOKIE_SECRET=${AUTHENTICATION_SECRET}
27-
#- OAUTH2_PROXY_COOKIE_DOMAINS=.${GUI_HOST}
28-
- OAUTH2_PROXY_COOKIE_DOMAINS=${GUI_HOST}
27+
- OAUTH2_PROXY_COOKIE_DOMAINS=.${GUI_HOST}
2928
- OAUTH2_PROXY_HTTP_ADDRESS=:4180
3029
- OAUTH2_PROXY_REVERSE_PROXY=true
31-
#- OAUTH2_PROXY_WHITELIST_DOMAINS=.${GUI_HOST}
32-
- OAUTH2_PROXY_WHITELIST_DOMAINS=${GUI_HOST}
30+
- OAUTH2_PROXY_WHITELIST_DOMAINS=.${GUI_HOST}
3331
- OAUTH2_PROXY_UPSTREAMS=static://202
3432
- OAUTH2_PROXY_EMAIL_DOMAINS=*
3533
- OAUTH2_PROXY_ALLOWED_GROUPS=${ALLOWED_GROUPS}
@@ -39,8 +37,6 @@ services:
3937
# Pass Authorization Header and some user information to spot
4038
- OAUTH2_PROXY_SET_AUTHORIZATION_HEADER=true
4139
- OAUTH2_PROXY_SET_XAUTHREQUEST=true
42-
- OAUTH2_PROXY_JWT_KEY=$(cat public_key.pem)
43-
4440
labels:
4541
- "traefik.enable=true"
4642
- "traefik.http.middlewares.traefik-forward-auth.forwardauth.address=http://traefik-forward-auth:4180"
@@ -53,9 +49,9 @@ services:
5349
image: samply/organoid-dashboard:main
5450
labels:
5551
- "traefik.enable=true"
56-
- "traefik.http.routers.idb.rule=Host(`${GUI_HOST}`)"
57-
- "traefik.http.routers.idb.tls=true"
58-
- "traefik.http.routers.idb.middlewares=traefik-forward-auth"
52+
- "traefik.http.routers.organoid-dashboard.rule=Host(`${GUI_HOST}`)"
53+
- "traefik.http.routers.organoid-dashboard.tls=true"
54+
- "traefik.http.routers.organoid-dashboard.middlewares=traefik-forward-auth"
5955

6056
spot:
6157
image: samply/rustyspot:main
@@ -81,7 +77,7 @@ services:
8177
- "traefik.http.routers.spot.rule=Host(`${GUI_HOST}`) && PathPrefix(`/prod`)"
8278
- "traefik.http.middlewares.stripprefix_spot_prod.stripprefix.prefixes=/prod"
8379
- "traefik.http.routers.spot.tls=true"
84-
- "traefik.http.routers.spot.middlewares=corsheaders,stripprefix_spot_prod"
80+
- "traefik.http.routers.spot.middlewares=corsheaders,traefik-forward-auth,stripprefix_spot_prod"
8581

8682
beam-proxy:
8783
image: docker.verbis.dkfz.de/cache/samply/beam-proxy:develop
@@ -96,7 +92,7 @@ services:
9692
- root.crt.pem
9793

9894
secrets:
99-
proxy.pem:
95+
proxy.pem:
10096
file: organoid-dashboard.priv.pem
10197
root.crt.pem:
10298
file: root.crt.pem

src/internal/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,3 @@ window.addEventListener("load", () => {
158158
updateTable(exampleParsedResponse);
159159
updateTable(exampleParsedResponse2);
160160
});
161-
162-
new EventSource('/esbuild').addEventListener('change', () => location.reload());

src/public/index.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,5 +326,3 @@ consentCheckbox.onchange = () => {
326326

327327
// Initialize the button state based on the checkbox
328328
consentButton.disabled = !consentCheckbox.checked;
329-
330-
new EventSource('/esbuild').addEventListener('change', () => location.reload());

0 commit comments

Comments
 (0)