Skip to content

Commit 29216ce

Browse files
committed
🔧(compose) create y-provider converter service
We wanto to have in the compose stack a dedicated service for the converter like we did in the helm chart. The change is also made with the e2e compose file
1 parent a288d24 commit 29216ce

5 files changed

Lines changed: 33 additions & 6 deletions

File tree

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ run-backend: ## Start only the backend application and all needed services
232232
@$(COMPOSE) up --force-recreate -d docspec
233233
@$(COMPOSE) up --force-recreate -d celery-dev
234234
@$(COMPOSE) up --force-recreate -d y-provider-development
235+
@$(COMPOSE) up --force-recreate -d y-provider-development-converter
235236
@$(COMPOSE) up --force-recreate -d nginx
236237
.PHONY: run-backend
237238

@@ -247,6 +248,7 @@ run-e2e:
247248
@$(COMPOSE_E2E) stop y-provider-development
248249
@$(COMPOSE_E2E) up --force-recreate -d frontend
249250
@$(COMPOSE_E2E) up --force-recreate -d y-provider
251+
@$(COMPOSE_E2E) up --force-recreate -d y-provider-converter
250252
.PHONY: run-e2e
251253

252254
status: ## an alias for "docker compose ps"

compose-e2e.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
services:
2-
32
frontend:
43
user: "${DOCKER_USER:-1000}"
5-
build:
4+
build:
65
context: .
76
dockerfile: ./src/frontend/Dockerfile
87
target: frontend-production
@@ -16,7 +15,7 @@ services:
1615

1716
y-provider:
1817
user: ${DOCKER_USER:-1000}
19-
build:
18+
build:
2019
context: .
2120
dockerfile: ./src/frontend/servers/y-provider/Dockerfile
2221
target: y-provider
@@ -26,4 +25,15 @@ services:
2625
- env.d/development/common
2726
- env.d/development/common.local
2827
ports:
29-
- "4444:4444"
28+
- "4444:4444"
29+
30+
y-provider-converter:
31+
user: ${DOCKER_USER:-1000}
32+
image: impress:y-provider-production
33+
restart: unless-stopped
34+
env_file:
35+
- env.d/development/common
36+
- env.d/development/common.local
37+
depends_on:
38+
y-provider:
39+
condition: service_started

compose.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,21 @@ services:
199199
- /home/frontend/node_modules
200200
- /home/frontend/servers/y-provider/node_modules
201201

202+
y-provider-development-converter:
203+
user: ${DOCKER_USER:-1000}
204+
image: impress:y-provider-development
205+
restart: unless-stopped
206+
env_file:
207+
- env.d/development/common
208+
- env.d/development/common.local
209+
volumes:
210+
- ./src/frontend/:/home/frontend
211+
- /home/frontend/node_modules
212+
- /home/frontend/servers/y-provider/node_modules
213+
depends_on:
214+
y-provider-development:
215+
condition: service_started
216+
202217
kc_postgresql:
203218
image: postgres:14.3
204219
healthcheck:

env.d/development/common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ COLLABORATION_WS_URL=ws://localhost:4444/collaboration/ws/
8181
COLLABORATION_WS_INACTIVITY_TIMEOUT=15 # Seconds
8282

8383
DJANGO_SERVER_TO_SERVER_API_TOKENS=server-api-token
84-
Y_PROVIDER_API_BASE_URL=http://y-provider-development:4444/api/
84+
Y_PROVIDER_API_BASE_URL=http://y-provider-development-converter:4444/api/
8585
Y_PROVIDER_API_KEY=yprovider-api-key
8686

8787
DOCSPEC_API_URL=http://docspec:4000/conversion

env.d/development/common.e2e

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
BURST_THROTTLE_RATES="1000/minute"
33
COLLABORATION_API_URL=http://y-provider:4444/collaboration/api/
44
SUSTAINED_THROTTLE_RATES="1000/minute"
5-
Y_PROVIDER_API_BASE_URL=http://y-provider:4444/api/
5+
Y_PROVIDER_API_BASE_URL=http://y-provider-converter:4444/api/
66

77
# Throttle
88
API_DOCUMENT_THROTTLE_RATE=1000/min

0 commit comments

Comments
 (0)