Skip to content

Commit b253a8a

Browse files
lmarinilmarini
committed
Traefik not working with frontend.
1 parent 97119b9 commit b253a8a

3 files changed

Lines changed: 151 additions & 16 deletions

File tree

‎docker-compose.dev.yml‎

Lines changed: 121 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,40 +63,54 @@ services:
6363
- minio3
6464
- minio4
6565

66-
postgres:
67-
image: postgres:16
66+
postgres-keycloak:
67+
image: postgres:18.0
6868
networks:
6969
- clowder2
70+
ports:
71+
- "5432:5432"
7072
volumes:
7173
- postgres_data:/var/lib/postgresql/data
7274
environment:
7375
POSTGRES_DB: keycloak_dev
7476
POSTGRES_USER: keycloak
7577
POSTGRES_PASSWORD: password
78+
healthcheck:
79+
test: [ "CMD-SHELL", "pg_isready -U keycloak -d keycloak" ]
80+
interval: 10s
81+
timeout: 5s
82+
retries: 5
7683

7784
keycloak:
78-
image: quay.io/keycloak/keycloak:20.0
85+
image: quay.io/keycloak/keycloak:26.4.0
7986
volumes:
8087
- ./scripts/keycloak/clowder-realm-dev.json:/opt/keycloak/data/import/realm.json:ro
8188
- ./scripts/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
8289
networks:
8390
- clowder2
8491
command:
8592
- start-dev
86-
- --http-relative-path /keycloak
93+
# - --http-enabled=true
94+
# - --hostname=localhost
95+
# - --hostname-strict=false
96+
## - --hostname-strict-https=false
97+
## - --https-port=0
98+
## - --http-port=8080
99+
- --http-relative-path=/keycloak
87100
- --import-realm
88101
environment:
89102
KEYCLOAK_ADMIN: admin
90103
KEYCLOAK_ADMIN_PASSWORD: admin
91104
KC_DB: postgres
92-
KC_DB_URL_HOST: postgres
105+
KC_DB_URL_HOST: postgres-keycloak
93106
KC_DB_URL_DATABASE: keycloak_dev
94107
KC_DB_USERNAME: keycloak
95108
KC_DB_PASSWORD: password
96109
ports:
97-
- 8080:8080
110+
- "8080:8080"
98111
depends_on:
99-
- postgres
112+
postgres-keycloak:
113+
condition: service_healthy
100114

101115
maildev:
102116
image: maildev/maildev
@@ -171,6 +185,106 @@ services:
171185
- mongo
172186
- rabbitmq
173187

188+
# # Extractors
189+
# name-entity-recognition:
190+
# image: socialmediamacroscope/name_entity_recognition_extractor:latest
191+
# environment:
192+
# CLOWDER_VERSION: 2
193+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
194+
# networks:
195+
# - clowder2
196+
# restart: unless-stopped
197+
# depends_on:
198+
# - rabbitmq
199+
#
200+
# network-analysis:
201+
# image: socialmediamacroscope/network_analysis_extractor:latest
202+
# environment:
203+
# CLOWDER_VERSION: 2
204+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
205+
# networks:
206+
# - clowder2
207+
# restart: unless-stopped
208+
# depends_on:
209+
# - rabbitmq
210+
#
211+
# topic-modeling:
212+
# image: socialmediamacroscope/topic_modeling_extractor:latest
213+
# environment:
214+
# CLOWDER_VERSION: 2
215+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
216+
# networks:
217+
# - clowder2
218+
# restart: unless-stopped
219+
# depends_on:
220+
# - rabbitmq
221+
#
222+
# natural-language-preprocessing:
223+
# image: socialmediamacroscope/preprocessing_extractor:latest
224+
# environment:
225+
# CLOWDER_VERSION: 2
226+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
227+
# networks:
228+
# - clowder2
229+
# restart: unless-stopped
230+
# depends_on:
231+
# - rabbitmq
232+
#
233+
# sentiment-analysis:
234+
# image: socialmediamacroscope/sentiment_analysis_extractor:latest
235+
# environment:
236+
# CLOWDER_VERSION: 2
237+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
238+
# networks:
239+
# - clowder2
240+
# restart: unless-stopped
241+
# depends_on:
242+
# - rabbitmq
243+
#
244+
# image-preview:
245+
# image: clowder/extractors-image-preview:latest
246+
# environment:
247+
# CLOWDER_VERSION: 2
248+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
249+
# networks:
250+
# - clowder2
251+
# restart: unless-stopped
252+
# depends_on:
253+
# - rabbitmq
254+
#
255+
# image-metadata:
256+
# image: clowder/extractors-image-metadata:latest
257+
# environment:
258+
# CLOWDER_VERSION: 2
259+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
260+
# networks:
261+
# - clowder2
262+
# restart: unless-stopped
263+
# depends_on:
264+
# - rabbitmq
265+
#
266+
# audio-preview:
267+
# image: clowder/extractors-audio-preview:latest
268+
# environment:
269+
# CLOWDER_VERSION: 2
270+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
271+
# networks:
272+
# - clowder2
273+
# restart: unless-stopped
274+
# depends_on:
275+
# - rabbitmq
276+
#
277+
# file-digest:
278+
# image: clowder/extractors-digest:latest
279+
# environment:
280+
# CLOWDER_VERSION: 2
281+
# RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
282+
# networks:
283+
# - clowder2
284+
# restart: unless-stopped
285+
# depends_on:
286+
# - rabbitmq
287+
174288
networks:
175289
clowder2:
176290
name: clowder2

‎docker-compose.extractors.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ services:
8282

8383
networks:
8484
clowder2:
85+
external: true

‎docker-compose.yml‎

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ services:
2121
restart: unless-stopped
2222
command:
2323
- --api.insecure=true
24-
- --providers.docker
25-
# - --entryPoints.web.address=:80
24+
- --providers.docker=true
25+
- --entryPoints.web.address=:80
2626
ports:
2727
# The HTTP port
2828
- "80:80"
@@ -75,7 +75,10 @@ services:
7575
labels:
7676
- "traefik.enable=true"
7777
- "traefik.http.routers.backend.rule=PathPrefix(`/api`)"
78+
- "traefik.http.routers.backend.entrypoints=web"
7879
- "traefik.http.routers.swagger.rule=PathPrefix(`/docs`)"
80+
- "traefik.http.routers.swagger.entrypoints=web"
81+
- "traefik.http.routers.swagger.service=backend"
7982
- "traefik.http.services.backend.loadbalancer.server.port=80"
8083
- "traefik.http.routers.backend.priority=5"
8184

@@ -84,6 +87,8 @@ services:
8487
restart: unless-stopped
8588
build:
8689
context: ./frontend
90+
ports:
91+
- "3000:80"
8792
networks:
8893
- clowder2
8994
depends_on:
@@ -94,6 +99,8 @@ services:
9499
labels:
95100
- "traefik.enable=true"
96101
- "traefik.http.routers.frontend.rule=PathPrefix(`/`)"
102+
- "traefik.http.routers.frontend.entrypoints=web"
103+
- "traefik.http.routers.frontend.service=frontend"
97104
- "traefik.http.services.frontend.loadbalancer.server.port=80"
98105
- "traefik.http.routers.frontend.priority=1"
99106

@@ -134,6 +141,8 @@ services:
134141
restart: unless-stopped
135142
networks:
136143
- clowder2
144+
ports:
145+
- "27017:27017"
137146
volumes:
138147
- mongo:/data/db
139148

@@ -179,20 +188,27 @@ services:
179188
- minio3
180189
- minio4
181190

182-
postgres:
183-
image: postgres:16
191+
keycloak-postgres:
192+
container_name: keycloak-postgres
193+
hostname: keycloak-postgres
194+
image: postgres:18.0
184195
restart: unless-stopped
185196
networks:
186197
- clowder2
187198
volumes:
188-
- postgres_data:/var/lib/postgresql/data
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
189205
environment:
190206
POSTGRES_DB: keycloak_prod
191207
POSTGRES_USER: keycloak
192208
POSTGRES_PASSWORD: password
193209

194210
keycloak:
195-
image: quay.io/keycloak/keycloak:20.0
211+
image: quay.io/keycloak/keycloak:26.4.0
196212
restart: unless-stopped
197213
networks:
198214
- clowder2
@@ -201,21 +217,24 @@ services:
201217
- ./scripts/keycloak/clowder-theme/:/opt/keycloak/themes/clowder-theme/:ro
202218
command:
203219
- start-dev
204-
- --http-relative-path /keycloak
220+
- --http-relative-path=/keycloak
205221
- --import-realm
206222
environment:
207223
KEYCLOAK_ADMIN: admin
208224
KEYCLOAK_ADMIN_PASSWORD: admin
209225
KC_DB: postgres
210-
KC_DB_URL_HOST: postgres
226+
KC_DB_URL_HOST: keycloak-postgres
227+
KC_DB_URL_PORT: "5432"
211228
KC_DB_URL_DATABASE: keycloak_prod
212229
KC_DB_USERNAME: keycloak
213230
KC_DB_PASSWORD: password
214231
depends_on:
215-
- postgres
232+
keycloak-postgres:
233+
condition: service_healthy
216234
labels:
217235
- "traefik.enable=true"
218236
- "traefik.http.routers.keycloak.rule=PathPrefix(`/keycloak`)"
237+
- "traefik.http.routers.keycloak.entrypoints=web"
219238
- "traefik.http.services.keycloak.loadbalancer.server.port=8080"
220239
- "traefik.http.routers.keycloak.priority=10"
221240

@@ -272,3 +291,4 @@ volumes:
272291

273292
networks:
274293
clowder2:
294+
name: clowder2

0 commit comments

Comments
 (0)