Skip to content

chore: fix docker composefrontend build args, ws header error msgs #2996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

chore: fix docker composefrontend build args, ws header error msgs #2996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docker/dev-host/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -127,6 +129,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down
24 changes: 24 additions & 0 deletions docker/dev-multidc-multinode/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -152,6 +154,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -193,6 +197,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -232,6 +238,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -408,6 +418,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -447,6 +459,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -486,6 +500,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -660,6 +678,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -699,6 +719,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -738,6 +760,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down
12 changes: 12 additions & 0 deletions docker/dev-multidc/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -151,6 +153,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -299,6 +305,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -443,6 +453,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down
8 changes: 8 additions & 0 deletions docker/dev-multinode/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -144,6 +146,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -182,6 +186,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down Expand Up @@ -218,6 +224,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down
4 changes: 4 additions & 0 deletions docker/dev/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -144,6 +146,8 @@ services:
context: ../..
dockerfile: docker/universal/Dockerfile
target: engine-full
args:
BUILD_FRONTEND: 'true'
platform: linux/amd64
restart: unless-stopped
environment:
Expand Down
6 changes: 6 additions & 0 deletions docker/template/src/docker-compose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/api-public/src/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/guard/server/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/core/guard/server/src/routing/pegboard_gateway.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
})?
Expand Down
2 changes: 1 addition & 1 deletion packages/core/guard/server/src/routing/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
})?
Expand Down
Loading