change default periphery port to 8120

This commit is contained in:
mbecker20
2024-03-26 23:37:55 -07:00
parent 48ff1ebefa
commit bfcdf011c4
5 changed files with 12 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
FROM rust:1.75.0-bullseye as builder
FROM rust:1.77.0-bullseye as builder
WORKDIR /builder
COPY . .

View File

@@ -344,7 +344,7 @@ async fn get_aws_builder(
update_update(update.clone()).await?;
let periphery_address = format!("http://{ip}:8000");
let periphery_address = format!("http://{ip}:{}", config.port);
let periphery =
PeripheryClient::new(&periphery_address, &core_config().passkey);

View File

@@ -61,7 +61,7 @@ impl Resolve<LaunchServer, User> for State {
write::CreateServer {
name,
config: PartialServerConfig {
address: format!("http://{}:8000", instance.ip)
address: format!("http://{}:8120", instance.ip)
.into(),
region: region.into(),
..Default::default()

View File

@@ -128,7 +128,7 @@ pub struct PeripheryConfig {
}
fn default_periphery_port() -> u16 {
8000
8120
}
fn default_repo_dir() -> PathBuf {

View File

@@ -115,6 +115,7 @@ impl BuilderConfig {
use_public_ip: partial
.use_public_ip
.unwrap_or(config.use_public_ip),
port: partial.port.unwrap_or(config.port),
github_accounts: partial
.github_accounts
.unwrap_or(config.github_accounts),
@@ -167,6 +168,9 @@ pub struct AwsBuilderConfig {
pub assign_public_ip: bool,
pub use_public_ip: bool,
/// The port periphery will be running on
#[serde(default = "default_port")]
pub port: i32,
#[serde(default)]
pub github_accounts: Vec<String>,
#[serde(default)]
@@ -185,6 +189,10 @@ fn aws_default_volume_gb() -> i32 {
20
}
fn default_port() -> i32 {
8120
}
#[typeshare]
pub type BuilderQuery = ResourceQuery<BuilderQuerySpecifics>;