Skip to content

Commit 5476ff5

Browse files
synzensynzen
committed
Fix migration containers failing
1 parent eff0a7c commit 5476ff5

File tree

10 files changed

+587
-6154
lines changed

10 files changed

+587
-6154
lines changed

‎.github/workflows/docker-images.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: docker/build-push-action@v6
4242
with:
4343
context: services/user-feeds
44-
target: prod
44+
target: build
4545
push: true
4646
tags: ${{ steps.meta.outputs.tags }}
4747
labels: ${{ steps.meta.outputs.labels }}
@@ -78,7 +78,7 @@ jobs:
7878
uses: docker/build-push-action@v6
7979
with:
8080
context: services/feed-requests
81-
target: prod
81+
target: build
8282
push: true
8383
tags: ${{ steps.meta.outputs.tags }}
8484
labels: ${{ steps.meta.outputs.labels }}

‎docker-compose.base.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ services:
110110
context: services/feed-requests
111111
dockerfile: Dockerfile
112112
target: build
113-
command: "npm run migration:local:up"
113+
command: "npm run migration:up"
114114
depends_on:
115115
feed-requests-postgres-db:
116116
condition: service_started
@@ -194,7 +194,7 @@ services:
194194
context: services/user-feeds
195195
dockerfile: Dockerfile
196196
target: build
197-
command: npm run migration:local:up
197+
command: npm run migration:up
198198
depends_on:
199199
- user-feeds-postgres-db
200200
environment:

‎docker-compose.dev.yml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ services:
6262
command: npm run start:dev
6363
env_file:
6464
- ./.env.local
65+
environment:
66+
- NODE_ENV=development
6567

6668
discord-rest-listener-service:
6769
extends:
@@ -81,7 +83,7 @@ services:
8183
volumes:
8284
- ./services/feed-requests:/usr/src/app
8385
- /usr/src/app/node_modules/
84-
command: npm run start:local
86+
command: npm run start:watch
8587
env_file:
8688
- ./.env.local
8789
environment:
@@ -90,6 +92,7 @@ services:
9092
- FEED_REQUESTS_S3_API_KEY_ID=1
9193
- FEED_REQUESTS_S3_API_KEY=1
9294
- FEED_REQUESTS_START_TARGET=service
95+
- NODE_ENV=local
9396

9497
feed-requests-api:
9598
extends:
@@ -101,24 +104,26 @@ services:
101104
ports:
102105
- "5000:5000"
103106
- "4999:4999"
104-
command: npm run start:local
107+
command: npm run start:watch
105108
env_file:
106109
- ./.env.local
107110
environment:
108111
- FEED_REQUESTS_START_TARGET=api
112+
- NODE_ENV=local
109113

110114
feed-requests-postgres-migration:
111115
extends:
112116
file: docker-compose.base.yml
113117
service: feed-requests-postgres-migration
114-
command: "npm run migration:local:up"
118+
command: "npm run migration:up"
115119
env_file:
116120
- ./.env.local
117121
environment:
118122
- FEED_REQUESTS_S3_ENDPOINT=http://seaweed-fs:8333
119123
- FEED_REQUESTS_S3_API_KEY_ID=1
120124
- FEED_REQUESTS_S3_API_KEY=1
121125
- LOG_LEVEL=debug
126+
- NODE_ENV=local
122127

123128
user-feeds-service:
124129
extends:
@@ -127,12 +132,13 @@ services:
127132
volumes:
128133
- ./services/user-feeds:/usr/src/app
129134
- /usr/src/app/node_modules/
130-
command: npm run start:local
135+
command: npm run start:watch
131136
env_file:
132137
- ./.env.local
133138
environment:
134139
- LOG_LEVEL=debug
135140
- USER_FEEDS_START_TARGET=service
141+
- NODE_ENV=local
136142

137143
user-feeds-api:
138144
extends:
@@ -143,20 +149,23 @@ services:
143149
- /usr/src/app/node_modules/
144150
ports:
145151
- "5001:5000"
146-
command: npm run start:local
152+
command: npm run start:watch
147153
env_file:
148154
- ./.env.local
149155
environment:
150156
- LOG_LEVEL=debug
151157
- USER_FEEDS_START_TARGET=api
158+
- NODE_ENV=local
152159

153160
user-feeds-postgres-migration:
154161
extends:
155162
file: docker-compose.base.yml
156163
service: user-feeds-postgres-migration
157-
command: npm run migration:local:up
164+
command: npm run migration:up
158165
env_file:
159166
- ./.env.local
167+
environment:
168+
- NODE_ENV=local
160169

161170
# Schedule emitter
162171
schedule-emitter-service:
@@ -200,6 +209,7 @@ services:
200209
- BACKEND_API_NODE_ENV=local
201210
- BACKEND_API_USER_FEEDS_API_HOST=http://user-feeds-api:5000
202211
- LOG_LEVEL=debug
212+
- NODE_ENV=local
203213
command: npm run start:local
204214
networks:
205215
- monitorss-default

‎docker-compose.local.yml‎

Lines changed: 179 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
name: monitorss-prod
2+
services:
3+
bot-presence-service:
4+
extends:
5+
file: ./docker-compose.base.yml
6+
service: bot-presence-service
7+
build:
8+
context: services/bot-presence
9+
dockerfile: Dockerfile
10+
target: prod
11+
command: ["node", "dist/main.js"]
12+
env_file:
13+
- ./.env.prod
14+
environment:
15+
- NODE_ENV=production
16+
17+
feed-requests-redis-cache:
18+
extends:
19+
file: ./docker-compose.base.yml
20+
service: feed-requests-redis-cache
21+
22+
rabbitmq-broker:
23+
extends:
24+
file: ./docker-compose.base.yml
25+
service: rabbitmq-broker
26+
27+
mongo:
28+
extends:
29+
file: ./docker-compose.base.yml
30+
service: mongo
31+
32+
feed-requests-postgres-db:
33+
extends:
34+
file: ./docker-compose.base.yml
35+
service: feed-requests-postgres-db
36+
37+
user-feeds-postgres-db:
38+
extends:
39+
file: ./docker-compose.base.yml
40+
service: user-feeds-postgres-db
41+
42+
discord-rest-listener-service:
43+
extends:
44+
file: ./docker-compose.base.yml
45+
service: discord-rest-listener-service
46+
build:
47+
context: services/discord-rest-listener
48+
dockerfile: Dockerfile
49+
target: prod
50+
command: ["node", "build/app.js"]
51+
env_file:
52+
- ./.env.prod
53+
environment:
54+
- NODE_ENV=production
55+
56+
feed-requests-service:
57+
extends:
58+
file: ./docker-compose.base.yml
59+
service: feed-requests-service
60+
build:
61+
context: services/feed-requests
62+
dockerfile: Dockerfile
63+
target: build
64+
command: ["node", "dist/main.js"]
65+
env_file:
66+
- ./.env.prod
67+
environment:
68+
- NODE_ENV=production
69+
70+
feed-requests-postgres-migration:
71+
extends:
72+
file: ./docker-compose.base.yml
73+
service: feed-requests-postgres-migration
74+
build:
75+
context: services/feed-requests
76+
dockerfile: Dockerfile
77+
target: build
78+
command: "npm run migration:up"
79+
env_file:
80+
- ./.env.prod
81+
environment:
82+
- NODE_ENV=production
83+
84+
user-feeds-service:
85+
extends:
86+
file: ./docker-compose.base.yml
87+
service: user-feeds-service
88+
build:
89+
context: services/user-feeds
90+
dockerfile: Dockerfile
91+
target: build
92+
command: ["node", "dist/main.js"]
93+
env_file:
94+
- ./.env.prod
95+
environment:
96+
- NODE_ENV=production
97+
98+
user-feeds-postgres-migration:
99+
extends:
100+
file: ./docker-compose.base.yml
101+
service: user-feeds-postgres-migration
102+
build:
103+
context: services/user-feeds
104+
dockerfile: Dockerfile
105+
target: build
106+
env_file:
107+
- ./.env.prod
108+
environment:
109+
- NODE_ENV=production
110+
111+
legacy-feed-bulk-converter-service:
112+
extends:
113+
file: ./docker-compose.base.yml
114+
service: legacy-feed-bulk-converter-service
115+
build:
116+
context: services/backend-api
117+
dockerfile: dockerfiles/web/mixed.Dockerfile
118+
target: prod
119+
command: ["node", "dist/scripts/legacy-feed-bulk-converter.js"]
120+
env_file:
121+
- ./.env.prod
122+
environment:
123+
- NODE_ENV=production
124+
125+
schedule-emitter-service:
126+
extends:
127+
file: ./docker-compose.base.yml
128+
service: schedule-emitter-service
129+
build:
130+
context: services/backend-api
131+
dockerfile: dockerfiles/web/mixed.Dockerfile
132+
target: prod
133+
command: ["node", "dist/scripts/schedule-emitter.js"]
134+
env_file:
135+
- ./.env.prod
136+
environment:
137+
- NODE_ENV=production
138+
139+
monolith:
140+
build:
141+
context: services/backend-api
142+
dockerfile: dockerfiles/web/mixed.Dockerfile
143+
target: prod
144+
restart: on-failure:3
145+
depends_on:
146+
- mongo
147+
- user-feeds-service
148+
- feed-requests-service
149+
ports:
150+
- "8000:8000"
151+
env_file:
152+
- ./.env.prod
153+
environment:
154+
- BACKEND_API_NODE_ENV=local
155+
- BACKEND_API_PORT=8000
156+
- BACKEND_API_DEFAULT_MAX_FEEDS=999999
157+
- BACKEND_API_USER_FEEDS_API_HOST=http://user-feeds-service:5000
158+
- BACKEND_API_FEED_REQUESTS_API_HOST=http://feed-requests-service:5000
159+
- BACKEND_API_FEED_USER_AGENT=MonitoRSS
160+
- BACKEND_API_RABBITMQ_BROKER_URL=amqp://guest:guest@rabbitmq-broker:5672/
161+
- BACKEND_API_USER_FEEDS_API_KEY=user-feeds-api-key
162+
- BACKEND_API_FEED_REQUESTS_API_KEY=feed-requests-api-key
163+
- LOG_LEVEL=info
164+
- NODE_ENV=production
165+
command: ["node", "dist/main.js"]
166+
networks:
167+
- monitorss-default
168+
169+
170+
volumes:
171+
mongodb-data:
172+
feed-requests-postgres-data:
173+
user-feeds-postgres-data:
174+
feed-requests-redis-data:
175+
driver: local
176+
177+
networks:
178+
monitorss-default:
179+
driver: bridge

‎docker-compose.yml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ services:
4242
command: ["node", "build/app.js"]
4343
env_file:
4444
- ./.env.prod
45+
environment:
46+
- NODE_ENV=production
4547

4648
feed-requests-service:
4749
extends:
@@ -59,9 +61,11 @@ services:
5961
file: ./docker-compose.base.yml
6062
service: feed-requests-postgres-migration
6163
image: ghcr.io/synzen/monitorss-feed-requests:main
62-
command: "npm run migration:local:up"
64+
command: "npm run migration:prod:up"
6365
env_file:
6466
- ./.env.prod
67+
environment:
68+
- NODE_ENV=production
6569

6670
user-feeds-service:
6771
extends:
@@ -71,14 +75,19 @@ services:
7175
command: ["node", "dist/main.js"]
7276
env_file:
7377
- ./.env.prod
78+
environment:
79+
- NODE_ENV=production
7480

7581
user-feeds-postgres-migration:
7682
extends:
7783
file: ./docker-compose.base.yml
7884
service: user-feeds-postgres-migration
7985
image: ghcr.io/synzen/monitorss-user-feeds:main
86+
command: "npm run migration:prod:up"
8087
env_file:
8188
- ./.env.prod
89+
environment:
90+
- NODE_ENV=production
8291

8392
legacy-feed-bulk-converter-service:
8493
extends:
@@ -88,6 +97,8 @@ services:
8897
command: ["node", "dist/scripts/legacy-feed-bulk-converter.js"]
8998
env_file:
9099
- ./.env.prod
100+
environment:
101+
- NODE_ENV=production
91102

92103
schedule-emitter-service:
93104
extends:
@@ -97,6 +108,8 @@ services:
97108
command: ["node", "dist/scripts/schedule-emitter.js"]
98109
env_file:
99110
- ./.env.prod
111+
environment:
112+
- NODE_ENV=production
100113

101114
monolith:
102115
image: ghcr.io/synzen/monitorss-monolith:main
@@ -120,6 +133,7 @@ services:
120133
- BACKEND_API_USER_FEEDS_API_KEY=user-feeds-api-key
121134
- BACKEND_API_FEED_REQUESTS_API_KEY=feed-requests-api-key
122135
- LOG_LEVEL=info
136+
- NODE_ENV=production
123137
command: ["node", "dist/main.js"]
124138
networks:
125139
- monitorss-default

0 commit comments

Comments
 (0)