Port mapping 80 tcp

NamseEnt · Nov 30, 2023 · f416c31 · f416c31
1 parent 94d56d2
commit f416c31
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/oioi/agent/src/main.rs b/oioi/agent/src/main.rs
@@ -12,6 +12,20 @@ const GRACEFUL_SHUTDOWN_TIMEOUT_SECS: i64 = 30;
 lazy_static::lazy_static! {
     static ref GROUP_NAME: String = std::env::var("GROUP_NAME").expect("GROUP_NAME env var not set");
     static ref EC2_INSTANCE_ID: String = std::env::var("EC2_INSTANCE_ID").expect("EC2_INSTANCE_ID env var not set");
+    static ref PORT_MAPPINGS: Vec<PortMapping> = std::env::var("PORT_MAPPINGS").map(|env_string| {
+        env_string.split(',').map(|mapping| {
+            let mut parts = mapping.split(&[',', '/']);
+            let container_port = parts.next().expect("container port not found").parse::<u16>().expect("container port is not a number");
+            let host_port = parts.next().expect("host port not found").parse::<u16>().expect("host port is not a number");
+            let protocol = parts.next().expect("protocol not found").to_string();
+
+            PortMapping {
+                container_port,
+                host_port,
+                protocol,
+            }
+        }).collect()
+    }).expect("PORT_MAPPINGS env var not set");
 }
 
 async fn real_main() -> Result<()> {
@@ -128,6 +142,20 @@ async fn run_new_container(docker: &Docker, image: &str) -> Result<()> {
                             ("awslogs-create-group".to_string(), "true".to_string()),
                         ])),
                     }),
+                    port_bindings: Some(std::collections::HashMap::from_iter(
+                        PORT_MAPPINGS
+                            .iter()
+                            .map(|mapping| {
+                                (
+                                    format!("{}/{}", mapping.container_port, mapping.protocol),
+                                    Some(vec![bollard::models::PortBinding {
+                                        host_ip: None,
+                                        host_port: Some(mapping.host_port.to_string()),
+                                    }]),
+                                )
+                            })
+                            .collect::<Vec<_>>(),
+                    )),
                     ..Default::default()
                 }),
                 ..Default::default()
@@ -164,3 +192,9 @@ async fn docker_prune(docker: &Docker) -> Result<()> {
 
     Ok(())
 }
+
+struct PortMapping {
+    container_port: u16,
+    host_port: u16,
+    protocol: String,
+}
diff --git a/oioi/cdk/lib/index.ts b/oioi/cdk/lib/index.ts
@@ -5,6 +5,7 @@ export interface OioiProps {
     groupName: string;
     image: string;
     vpc?: cdk.aws_ec2.Vpc;
+    portMappings?: PortMapping[];
 }
 
 export class Oioi extends Construct {
@@ -31,7 +32,7 @@ export class Oioi extends Construct {
                 ),
                 machineImage: cdk.aws_ec2.MachineImage.latestAmazonLinux2023({
                     cpuType: cdk.aws_ec2.AmazonLinuxCpuType.ARM_64,
-                    userData: getUserData(props.groupName),
+                    userData: getUserData(props),
                 }),
             },
         );
@@ -45,8 +46,24 @@ export class Oioi extends Construct {
     }
 }
 
-function getUserData(groupName: string): cdk.aws_ec2.UserData {
+type PortMapping = {
+    containerPort: number;
+    hostPort: number;
+    protocol: "tcp" | "udp";
+};
+
+function getUserData({
+    groupName,
+    portMappings,
+}: OioiProps): cdk.aws_ec2.UserData {
     const userData = cdk.aws_ec2.UserData.forLinux();
+    const portMappingsString =
+        portMappings
+            ?.map(
+                ({ containerPort, hostPort, protocol }) =>
+                    `${hostPort ?? containerPort}:${containerPort}/${protocol}`,
+            )
+            .join(",") ?? "";
 
     const dockerOptions = [
         "-d",
@@ -59,6 +76,7 @@ function getUserData(groupName: string): cdk.aws_ec2.UserData {
 
         `-e GROUP_NAME=${groupName}`,
         `-e EC2_INSTANCE_ID=$EC2_INSTANCE_ID`,
+        `-e PORT_MAPPINGS=${portMappingsString}`,
         "-v /var/run/docker.sock:/var/run/docker.sock docker",
     ].join(" ");
 

diff --git a/oioi/oioi-test-cdk/lib/oioi-test-cdk-stack.ts b/oioi/oioi-test-cdk/lib/oioi-test-cdk-stack.ts
@@ -12,6 +12,13 @@ export class OioiTestCdkStack extends cdk.Stack {
         const { vpc, autoScalingGroup } = new oioi.Oioi(this, "Oioi", {
             groupName: "test",
             image,
+            portMappings: [
+                {
+                    containerPort: 80,
+                    hostPort: 80,
+                    protocol: "tcp",
+                },
+            ],
         });
 
         const albTargetGroup =