Bump AWS AMI to Amazon Linux 2023 minimal

spacelift-io · Nov 9, 2023 · ad730a8 · ad730a8
1 parent e134752
commit ad730a8
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 383 deletions.
diff --git a/.github/workflows/build_aws_minimal_manual.yml b/.github/workflows/build_aws_minimal_manual.yml
diff --git a/aws.pkr.hcl b/aws.pkr.hcl
@@ -89,7 +89,7 @@ source "amazon-ebs" "spacelift" {
   source_ami_filter {
       filters = {
         virtualization-type = "hvm"
-        name                = "amzn2-ami-kernel-5.10-hvm-2*-gp2"
+        name                = "al2023-ami-minimal-*-kernel-6.1-${var.source_ami_architecture}"
         root-device-type    = "ebs"
         architecture        = var.source_ami_architecture
       }
@@ -144,11 +144,12 @@ build {
   provisioner "shell" {
     scripts = [
       "shared/scripts/data-directories.sh",
-      "aws/scripts/yum-update.sh",
+      "aws/scripts/dnf-update.sh",
+      "aws/scripts/system-deps.sh",
       "aws/scripts/docker.sh",
       "shared/scripts/gvisor.sh",
       "aws/scripts/cloudwatch-agent.sh",
-      "aws/scripts/jq.sh",
+      "aws/scripts/ssm-agent.sh"
     ]
   }
 

diff --git a/aws/scripts/cloudwatch-agent.sh b/aws/scripts/cloudwatch-agent.sh
@@ -11,7 +11,7 @@ fi
 DOWNLOAD_URL=https://s3.amazonaws.com/amazoncloudwatch-agent/amazon_linux/${CURRENTARCH}/latest/amazon-cloudwatch-agent.rpm
 RPM_PATH=/tmp/amazon-cloudwatch-agent.rpm
 
-touch /var/log/spacelift/{info,error}.log
+sudo touch /var/log/spacelift/{info,error}.log
 
 curl $DOWNLOAD_URL --output $RPM_PATH
 sudo rpm -U $RPM_PATH

diff --git a/aws_minimal/scripts/dnf-update.sh → aws/scripts/dnf-update.sh b/aws_minimal/scripts/dnf-update.sh → aws/scripts/dnf-update.sh
diff --git a/aws/scripts/docker.sh b/aws/scripts/docker.sh
@@ -1,5 +1,4 @@
 # This script installs and starts Docker.
 
-sudo amazon-linux-extras install docker
-sudo systemctl enable docker
-sudo service docker start
+sudo dnf install -y docker
+sudo systemctl enable --now docker
diff --git a/aws/scripts/jq.sh b/aws/scripts/jq.sh
diff --git a/aws_minimal/scripts/ssm-agent.sh → aws/scripts/ssm-agent.sh b/aws_minimal/scripts/ssm-agent.sh → aws/scripts/ssm-agent.sh
diff --git a/aws_minimal/scripts/system-deps.sh → aws/scripts/system-deps.sh b/aws_minimal/scripts/system-deps.sh → aws/scripts/system-deps.sh
diff --git a/aws/scripts/yum-update.sh b/aws/scripts/yum-update.sh
diff --git a/aws_minimal.pkr.hcl b/aws_minimal.pkr.hcl
diff --git a/aws_minimal/configs/amazon-cloudwatch-agent.json b/aws_minimal/configs/amazon-cloudwatch-agent.json