Update rust version in Dockerfile and (temporarily) change to cheaper…

… instance types
alexwaeseperlman · Feb 12, 2024 · 2981d71 · 2981d71
1 parent 6c07447
commit 2981d71
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/deployment/lib/resources-stack.ts b/deployment/lib/resources-stack.ts
@@ -382,7 +382,7 @@ export class ResourcesStack extends cdk.Stack {
       natGatewayProvider: ec2.NatProvider.instance({
         instanceType: ec2.InstanceType.of(
           ec2.InstanceClass.T3A,
-          ec2.InstanceSize.MICRO
+          ec2.InstanceSize.SMALL
         ),
       }),
       natGateways: 1,
@@ -431,8 +431,11 @@ export class ResourcesStack extends cdk.Stack {
       "unsafe-worker-capacity",
       {
         instanceType: ec2.InstanceType.of(
-          ec2.InstanceClass.C6G,
-          ec2.InstanceSize.MEDIUM
+          //TODO: In prod use C6G
+          /*ec2.InstanceClass.C6G,
+          ec2.InstanceSize.MEDIUM*/
+          ec2.InstanceClass.T4G,
+          ec2.InstanceSize.MICRO
         ),
         machineImage: ecs.EcsOptimizedImage.amazonLinux2(
           ecs.AmiHardwareType.ARM

diff --git a/website/Dockerfile b/website/Dockerfile
@@ -8,7 +8,7 @@ RUN npm ci
 COPY website/app .
 RUN npm run build
 
-FROM --platform=linux/arm64 rust:1.70 as backend
+FROM --platform=linux/arm64 rust:1.76-bullseye as backend
 WORKDIR /usr/src/backend
 RUN apt-get update && apt-get install pkg-config libssl-dev libpq-dev curl build-essential -y
 

diff --git a/website/dev-Dockerfile b/website/dev-Dockerfile
@@ -1,5 +1,5 @@
 # Build frontend in one container, backend in another, then copy the results into a third container
-FROM --platform=linux/arm64 rust:1.70
+FROM --platform=linux/arm64 rust:1.76-bullseye
 RUN apt-get update && apt-get install pkg-config libssl-dev libpq-dev curl build-essential -y
 
 ENV NVM_DIR /root/.nvm

diff --git a/workers/builder/Dockerfile b/workers/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 rust:1.70 as builder
+FROM --platform=linux/arm64 rust:1.76-bullseye as builder
 
 WORKDIR /usr/src/builder
 

diff --git a/workers/gameplay/Dockerfile b/workers/gameplay/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 rust:1.70 as builder
+FROM --platform=linux/arm64 rust:1.76-bullseye as builder
 
 WORKDIR /usr/src/gameplay
 

diff --git a/workers/gameplay/dev-Dockerfile b/workers/gameplay/dev-Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 rust:1.70
+FROM --platform=linux/arm64 rust:1.76-bullseye
 RUN apt-get update && apt-get install -y python3 pip ca-certificates
 
 # Install common python packages

diff --git a/workers/results/Dockerfile b/workers/results/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 rust:1.70 as builder
+FROM --platform=linux/arm64 rust:1.76-bullseye as builder
 
 WORKDIR /usr/src/results
 

diff --git a/workers/results/dev-Dockerfile b/workers/results/dev-Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/arm64 rust:1.70
+FROM --platform=linux/arm64 rust:1.76-bullseye
 
 
 RUN apt-get update && apt-get install -y entr