@@ -17,12 +17,12 @@ x-minio-common: &minio-common
1717services :
1818
1919 traefik :
20- image : traefik:v2.5
20+ image : traefik:v3.6
2121 restart : unless-stopped
2222 command :
23- - --api.insecure=true
24- - --providers.docker=true
25- - --entryPoints .web.address=:80
23+ - " --api.insecure=true"
24+ - " --providers.docker=true"
25+ - " --entrypoints .web.address=:80"
2626 ports :
2727 # The HTTP port
2828 - " 80:80"
@@ -75,10 +75,7 @@ services:
7575 labels :
7676 - " traefik.enable=true"
7777 - " traefik.http.routers.backend.rule=PathPrefix(`/api`)"
78- - " traefik.http.routers.backend.entrypoints=web"
7978 - " traefik.http.routers.swagger.rule=PathPrefix(`/docs`)"
80- - " traefik.http.routers.swagger.entrypoints=web"
81- - " traefik.http.routers.swagger.service=backend"
8279 - " traefik.http.services.backend.loadbalancer.server.port=80"
8380 - " traefik.http.routers.backend.priority=5"
8481
@@ -87,8 +84,6 @@ services:
8784 restart : unless-stopped
8885 build :
8986 context : ./frontend
90- ports :
91- - " 3000:80"
9287 networks :
9388 - clowder2
9489 depends_on :
@@ -99,8 +94,6 @@ services:
9994 labels :
10095 - " traefik.enable=true"
10196 - " traefik.http.routers.frontend.rule=PathPrefix(`/`)"
102- - " traefik.http.routers.frontend.entrypoints=web"
103- - " traefik.http.routers.frontend.service=frontend"
10497 - " traefik.http.services.frontend.loadbalancer.server.port=80"
10598 - " traefik.http.routers.frontend.priority=1"
10699
@@ -141,8 +134,6 @@ services:
141134 restart : unless-stopped
142135 networks :
143136 - clowder2
144- ports :
145- - " 27017:27017"
146137 volumes :
147138 - mongo:/data/db
148139
@@ -188,27 +179,20 @@ services:
188179 - minio3
189180 - minio4
190181
191- keycloak-postgres :
192- container_name : keycloak-postgres
193- hostname : keycloak-postgres
194- image : postgres:18.0
182+ postgres :
183+ image : postgres:16
195184 restart : unless-stopped
196185 networks :
197186 - clowder2
198187 volumes :
199- - postgres_data:/var/lib/postgresql
200- healthcheck :
201- test : [ "CMD-SHELL", "pg_isready -U keycloak -d keycloak" ]
202- interval : 10s
203- timeout : 5s
204- retries : 5
188+ - postgres_data:/var/lib/postgresql/data
205189 environment :
206190 POSTGRES_DB : keycloak_prod
207191 POSTGRES_USER : keycloak
208192 POSTGRES_PASSWORD : password
209193
210194 keycloak :
211- image : quay.io/keycloak/keycloak:26.4 .0
195+ image : quay.io/keycloak/keycloak:20 .0
212196 restart : unless-stopped
213197 networks :
214198 - clowder2
@@ -217,24 +201,21 @@ services:
217201 - ./scripts/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
218202 command :
219203 - start-dev
220- - --http-relative-path= /keycloak
204+ - --http-relative-path /keycloak
221205 - --import-realm
222206 environment :
223207 KEYCLOAK_ADMIN : admin
224208 KEYCLOAK_ADMIN_PASSWORD : admin
225209 KC_DB : postgres
226- KC_DB_URL_HOST : keycloak-postgres
227- KC_DB_URL_PORT : " 5432"
210+ KC_DB_URL_HOST : postgres
228211 KC_DB_URL_DATABASE : keycloak_prod
229212 KC_DB_USERNAME : keycloak
230213 KC_DB_PASSWORD : password
231214 depends_on :
232- keycloak-postgres :
233- condition : service_healthy
215+ - postgres
234216 labels :
235217 - " traefik.enable=true"
236218 - " traefik.http.routers.keycloak.rule=PathPrefix(`/keycloak`)"
237- - " traefik.http.routers.keycloak.entrypoints=web"
238219 - " traefik.http.services.keycloak.loadbalancer.server.port=8080"
239220 - " traefik.http.routers.keycloak.priority=10"
240221
@@ -291,4 +272,3 @@ volumes:
291272
292273networks :
293274 clowder2 :
294- name : clowder2
0 commit comments