diff --git a/docker/dev-host/docker-compose.yml b/docker/dev-host/docker-compose.yml index f98a9b03f0..3a052ef47e 100644 --- a/docker/dev-host/docker-compose.yml +++ b/docker/dev-host/docker-compose.yml @@ -68,6 +68,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -127,6 +129,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: diff --git a/docker/dev-multidc-multinode/docker-compose.yml b/docker/dev-multidc-multinode/docker-compose.yml index 17a5003443..702d7937a4 100644 --- a/docker/dev-multidc-multinode/docker-compose.yml +++ b/docker/dev-multidc-multinode/docker-compose.yml @@ -79,6 +79,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -152,6 +154,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -193,6 +197,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -232,6 +238,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -335,6 +343,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -408,6 +418,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -447,6 +459,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -486,6 +500,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -587,6 +603,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -660,6 +678,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -699,6 +719,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -738,6 +760,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: diff --git a/docker/dev-multidc/docker-compose.yml b/docker/dev-multidc/docker-compose.yml index e144aa902c..3bbd16e685 100644 --- a/docker/dev-multidc/docker-compose.yml +++ b/docker/dev-multidc/docker-compose.yml @@ -79,6 +79,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -151,6 +153,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -227,6 +231,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -299,6 +305,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -371,6 +379,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -443,6 +453,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: diff --git a/docker/dev-multinode/docker-compose.yml b/docker/dev-multinode/docker-compose.yml index 1720b19242..0fa4de0457 100644 --- a/docker/dev-multinode/docker-compose.yml +++ b/docker/dev-multinode/docker-compose.yml @@ -76,6 +76,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -144,6 +146,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -182,6 +186,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: @@ -218,6 +224,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 1452731f94..914b0493d9 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -76,6 +76,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped command: sleep infinity @@ -144,6 +146,8 @@ services: context: ../.. dockerfile: docker/universal/Dockerfile target: engine-full + args: + BUILD_FRONTEND: 'true' platform: linux/amd64 restart: unless-stopped environment: diff --git a/docker/template/src/docker-compose.ts b/docker/template/src/docker-compose.ts index 68d25a4d02..8b2ac402b2 100644 --- a/docker/template/src/docker-compose.ts +++ b/docker/template/src/docker-compose.ts @@ -174,6 +174,9 @@ export function generateDockerCompose(context: TemplateContext) { context: "../..", dockerfile: "docker/universal/Dockerfile", target: "engine-full", + args: { + BUILD_FRONTEND: "true" + } }, platform: "linux/amd64", restart: "unless-stopped", @@ -262,6 +265,9 @@ export function generateDockerCompose(context: TemplateContext) { context: "../..", dockerfile: "docker/universal/Dockerfile", target: "engine-full", + args: { + BUILD_FRONTEND: "true" + } }, platform: "linux/amd64", restart: "unless-stopped", diff --git a/packages/core/api-public/src/router.rs b/packages/core/api-public/src/router.rs index 0531d18275..c96111fdf5 100644 --- a/packages/core/api-public/src/router.rs +++ b/packages/core/api-public/src/router.rs @@ -3,7 +3,7 @@ use axum::{ middleware::{self, Next}, response::{Redirect, Response}, }; -use reqwest::header::{HeaderMap, AUTHORIZATION}; +use reqwest::header::{AUTHORIZATION, HeaderMap}; use rivet_api_builder::{create_router, extract::FailedExtraction}; use tower_http::cors::CorsLayer; use utoipa::OpenApi; diff --git a/packages/core/guard/server/src/errors.rs b/packages/core/guard/server/src/errors.rs index 1e9f5270b0..87af34af4a 100644 --- a/packages/core/guard/server/src/errors.rs +++ b/packages/core/guard/server/src/errors.rs @@ -7,7 +7,7 @@ use serde::Serialize; "guard", "missing_header", "Missing header required for routing.", - "Missing {header} header required for routing." + "Missing {header} header." )] pub struct MissingHeader { pub header: String, diff --git a/packages/core/guard/server/src/routing/pegboard_gateway.rs b/packages/core/guard/server/src/routing/pegboard_gateway.rs index 2a5f4cf3d7..25c655e3c3 100644 --- a/packages/core/guard/server/src/routing/pegboard_gateway.rs +++ b/packages/core/guard/server/src/routing/pegboard_gateway.rs @@ -44,7 +44,7 @@ pub async fn route_request( }) .ok_or_else(|| { crate::errors::MissingHeader { - header: "actor protocol in sec-websocket-protocol".to_string(), + header: "`rivet_actor.*` protocol in sec-websocket-protocol".to_string(), } .build() })? diff --git a/packages/core/guard/server/src/routing/runner.rs b/packages/core/guard/server/src/routing/runner.rs index a1a492cff9..64db4a1ffa 100644 --- a/packages/core/guard/server/src/routing/runner.rs +++ b/packages/core/guard/server/src/routing/runner.rs @@ -40,7 +40,7 @@ pub async fn route_request( }) .ok_or_else(|| { crate::errors::MissingHeader { - header: SEC_WEBSOCKET_PROTOCOL.to_string(), + header: "`rivet_token.*` protocol in sec-websocket-protocol".to_string(), } .build() })?