From bfcdf011c4ab4145182a3c7b106c4caf2462c502 Mon Sep 17 00:00:00 2001
From: mbecker20 <becker.maxh@gmail.com>
Date: Tue, 26 Mar 2024 23:37:55 -0700
Subject: [PATCH] change default periphery port to 8120

---
 bin/core/Dockerfile                    | 2 +-
 bin/core/src/api/execute/build.rs      | 2 +-
 bin/core/src/api/write/launch.rs       | 2 +-
 bin/periphery/src/config.rs            | 2 +-
 client/core/rs/src/entities/builder.rs | 8 ++++++++
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bin/core/Dockerfile b/bin/core/Dockerfile
index 2c525eba5..b80bd3ac3 100644
--- a/bin/core/Dockerfile
+++ b/bin/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.75.0-bullseye as builder
+FROM rust:1.77.0-bullseye as builder
 WORKDIR /builder
 
 COPY . .
diff --git a/bin/core/src/api/execute/build.rs b/bin/core/src/api/execute/build.rs
index 425528d00..1dfb6b5e6 100644
--- a/bin/core/src/api/execute/build.rs
+++ b/bin/core/src/api/execute/build.rs
@@ -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);
 
diff --git a/bin/core/src/api/write/launch.rs b/bin/core/src/api/write/launch.rs
index 8a7c31a50..d4cab0035 100644
--- a/bin/core/src/api/write/launch.rs
+++ b/bin/core/src/api/write/launch.rs
@@ -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()
diff --git a/bin/periphery/src/config.rs b/bin/periphery/src/config.rs
index 107e6736f..8bb9816eb 100644
--- a/bin/periphery/src/config.rs
+++ b/bin/periphery/src/config.rs
@@ -128,7 +128,7 @@ pub struct PeripheryConfig {
 }
 
 fn default_periphery_port() -> u16 {
-  8000
+  8120
 }
 
 fn default_repo_dir() -> PathBuf {
diff --git a/client/core/rs/src/entities/builder.rs b/client/core/rs/src/entities/builder.rs
index 4d7160029..9adbee870 100644
--- a/client/core/rs/src/entities/builder.rs
+++ b/client/core/rs/src/entities/builder.rs
@@ -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>;