Skip to content

Commit 486addb

Browse files
MasterPtatoMasterPtato
committed
chore: fix docker composefrontend build args, ws header error msgs (#2996)
1 parent 324312d commit 486addb

File tree

10 files changed

+62
-4
lines changed

10 files changed

+62
-4
lines changed

‎docker/dev-host/docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ services:
6868
context: ../..
6969
dockerfile: docker/universal/Dockerfile
7070
target: engine-full
71+
args:
72+
BUILD_FRONTEND: 'true'
7173
platform: linux/amd64
7274
restart: unless-stopped
7375
command: sleep infinity
@@ -127,6 +129,8 @@ services:
127129
context: ../..
128130
dockerfile: docker/universal/Dockerfile
129131
target: engine-full
132+
args:
133+
BUILD_FRONTEND: 'true'
130134
platform: linux/amd64
131135
restart: unless-stopped
132136
environment:

‎docker/dev-multidc-multinode/docker-compose.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ services:
7979
context: ../..
8080
dockerfile: docker/universal/Dockerfile
8181
target: engine-full
82+
args:
83+
BUILD_FRONTEND: 'true'
8284
platform: linux/amd64
8385
restart: unless-stopped
8486
command: sleep infinity
@@ -152,6 +154,8 @@ services:
152154
context: ../..
153155
dockerfile: docker/universal/Dockerfile
154156
target: engine-full
157+
args:
158+
BUILD_FRONTEND: 'true'
155159
platform: linux/amd64
156160
restart: unless-stopped
157161
environment:
@@ -193,6 +197,8 @@ services:
193197
context: ../..
194198
dockerfile: docker/universal/Dockerfile
195199
target: engine-full
200+
args:
201+
BUILD_FRONTEND: 'true'
196202
platform: linux/amd64
197203
restart: unless-stopped
198204
environment:
@@ -232,6 +238,8 @@ services:
232238
context: ../..
233239
dockerfile: docker/universal/Dockerfile
234240
target: engine-full
241+
args:
242+
BUILD_FRONTEND: 'true'
235243
platform: linux/amd64
236244
restart: unless-stopped
237245
environment:
@@ -335,6 +343,8 @@ services:
335343
context: ../..
336344
dockerfile: docker/universal/Dockerfile
337345
target: engine-full
346+
args:
347+
BUILD_FRONTEND: 'true'
338348
platform: linux/amd64
339349
restart: unless-stopped
340350
command: sleep infinity
@@ -408,6 +418,8 @@ services:
408418
context: ../..
409419
dockerfile: docker/universal/Dockerfile
410420
target: engine-full
421+
args:
422+
BUILD_FRONTEND: 'true'
411423
platform: linux/amd64
412424
restart: unless-stopped
413425
environment:
@@ -447,6 +459,8 @@ services:
447459
context: ../..
448460
dockerfile: docker/universal/Dockerfile
449461
target: engine-full
462+
args:
463+
BUILD_FRONTEND: 'true'
450464
platform: linux/amd64
451465
restart: unless-stopped
452466
environment:
@@ -486,6 +500,8 @@ services:
486500
context: ../..
487501
dockerfile: docker/universal/Dockerfile
488502
target: engine-full
503+
args:
504+
BUILD_FRONTEND: 'true'
489505
platform: linux/amd64
490506
restart: unless-stopped
491507
environment:
@@ -587,6 +603,8 @@ services:
587603
context: ../..
588604
dockerfile: docker/universal/Dockerfile
589605
target: engine-full
606+
args:
607+
BUILD_FRONTEND: 'true'
590608
platform: linux/amd64
591609
restart: unless-stopped
592610
command: sleep infinity
@@ -660,6 +678,8 @@ services:
660678
context: ../..
661679
dockerfile: docker/universal/Dockerfile
662680
target: engine-full
681+
args:
682+
BUILD_FRONTEND: 'true'
663683
platform: linux/amd64
664684
restart: unless-stopped
665685
environment:
@@ -699,6 +719,8 @@ services:
699719
context: ../..
700720
dockerfile: docker/universal/Dockerfile
701721
target: engine-full
722+
args:
723+
BUILD_FRONTEND: 'true'
702724
platform: linux/amd64
703725
restart: unless-stopped
704726
environment:
@@ -738,6 +760,8 @@ services:
738760
context: ../..
739761
dockerfile: docker/universal/Dockerfile
740762
target: engine-full
763+
args:
764+
BUILD_FRONTEND: 'true'
741765
platform: linux/amd64
742766
restart: unless-stopped
743767
environment:

‎docker/dev-multidc/docker-compose.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ services:
7979
context: ../..
8080
dockerfile: docker/universal/Dockerfile
8181
target: engine-full
82+
args:
83+
BUILD_FRONTEND: 'true'
8284
platform: linux/amd64
8385
restart: unless-stopped
8486
command: sleep infinity
@@ -151,6 +153,8 @@ services:
151153
context: ../..
152154
dockerfile: docker/universal/Dockerfile
153155
target: engine-full
156+
args:
157+
BUILD_FRONTEND: 'true'
154158
platform: linux/amd64
155159
restart: unless-stopped
156160
environment:
@@ -227,6 +231,8 @@ services:
227231
context: ../..
228232
dockerfile: docker/universal/Dockerfile
229233
target: engine-full
234+
args:
235+
BUILD_FRONTEND: 'true'
230236
platform: linux/amd64
231237
restart: unless-stopped
232238
command: sleep infinity
@@ -299,6 +305,8 @@ services:
299305
context: ../..
300306
dockerfile: docker/universal/Dockerfile
301307
target: engine-full
308+
args:
309+
BUILD_FRONTEND: 'true'
302310
platform: linux/amd64
303311
restart: unless-stopped
304312
environment:
@@ -371,6 +379,8 @@ services:
371379
context: ../..
372380
dockerfile: docker/universal/Dockerfile
373381
target: engine-full
382+
args:
383+
BUILD_FRONTEND: 'true'
374384
platform: linux/amd64
375385
restart: unless-stopped
376386
command: sleep infinity
@@ -443,6 +453,8 @@ services:
443453
context: ../..
444454
dockerfile: docker/universal/Dockerfile
445455
target: engine-full
456+
args:
457+
BUILD_FRONTEND: 'true'
446458
platform: linux/amd64
447459
restart: unless-stopped
448460
environment:

‎docker/dev-multinode/docker-compose.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ services:
7676
context: ../..
7777
dockerfile: docker/universal/Dockerfile
7878
target: engine-full
79+
args:
80+
BUILD_FRONTEND: 'true'
7981
platform: linux/amd64
8082
restart: unless-stopped
8183
command: sleep infinity
@@ -144,6 +146,8 @@ services:
144146
context: ../..
145147
dockerfile: docker/universal/Dockerfile
146148
target: engine-full
149+
args:
150+
BUILD_FRONTEND: 'true'
147151
platform: linux/amd64
148152
restart: unless-stopped
149153
environment:
@@ -182,6 +186,8 @@ services:
182186
context: ../..
183187
dockerfile: docker/universal/Dockerfile
184188
target: engine-full
189+
args:
190+
BUILD_FRONTEND: 'true'
185191
platform: linux/amd64
186192
restart: unless-stopped
187193
environment:
@@ -218,6 +224,8 @@ services:
218224
context: ../..
219225
dockerfile: docker/universal/Dockerfile
220226
target: engine-full
227+
args:
228+
BUILD_FRONTEND: 'true'
221229
platform: linux/amd64
222230
restart: unless-stopped
223231
environment:

‎docker/dev/docker-compose.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ services:
7676
context: ../..
7777
dockerfile: docker/universal/Dockerfile
7878
target: engine-full
79+
args:
80+
BUILD_FRONTEND: 'true'
7981
platform: linux/amd64
8082
restart: unless-stopped
8183
command: sleep infinity
@@ -144,6 +146,8 @@ services:
144146
context: ../..
145147
dockerfile: docker/universal/Dockerfile
146148
target: engine-full
149+
args:
150+
BUILD_FRONTEND: 'true'
147151
platform: linux/amd64
148152
restart: unless-stopped
149153
environment:

‎docker/template/src/docker-compose.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ export function generateDockerCompose(context: TemplateContext) {
174174
context: "../..",
175175
dockerfile: "docker/universal/Dockerfile",
176176
target: "engine-full",
177+
args: {
178+
BUILD_FRONTEND: "true"
179+
}
177180
},
178181
platform: "linux/amd64",
179182
restart: "unless-stopped",
@@ -262,6 +265,9 @@ export function generateDockerCompose(context: TemplateContext) {
262265
context: "../..",
263266
dockerfile: "docker/universal/Dockerfile",
264267
target: "engine-full",
268+
args: {
269+
BUILD_FRONTEND: "true"
270+
}
265271
},
266272
platform: "linux/amd64",
267273
restart: "unless-stopped",

‎packages/core/api-public/src/router.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use axum::{
33
middleware::{self, Next},
44
response::{Redirect, Response},
55
};
6-
use reqwest::header::{HeaderMap, AUTHORIZATION};
6+
use reqwest::header::{AUTHORIZATION, HeaderMap};
77
use rivet_api_builder::{create_router, extract::FailedExtraction};
88
use tower_http::cors::CorsLayer;
99
use utoipa::OpenApi;

‎packages/core/guard/server/src/errors.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use serde::Serialize;
77
"guard",
88
"missing_header",
99
"Missing header required for routing.",
10-
"Missing {header} header required for routing."
10+
"Missing {header} header."
1111
)]
1212
pub struct MissingHeader {
1313
pub header: String,

‎packages/core/guard/server/src/routing/pegboard_gateway.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub async fn route_request(
4444
})
4545
.ok_or_else(|| {
4646
crate::errors::MissingHeader {
47-
header: "actor protocol in sec-websocket-protocol".to_string(),
47+
header: "`rivet_actor.*` protocol in sec-websocket-protocol".to_string(),
4848
}
4949
.build()
5050
})?

‎packages/core/guard/server/src/routing/runner.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub async fn route_request(
4040
})
4141
.ok_or_else(|| {
4242
crate::errors::MissingHeader {
43-
header: SEC_WEBSOCKET_PROTOCOL.to_string(),
43+
header: "`rivet_token.*` protocol in sec-websocket-protocol".to_string(),
4444
}
4545
.build()
4646
})?

0 commit comments

Comments
 (0)