Merge branch 'main' into tags

CHANGELOG.md

@@ -5,6 +5,104 @@
 - [Amazon Linux 2 release notes](https://docs.aws.amazon.com/AL2/latest/relnotes/relnotes-al2.html)
 - [Amazon Linux AMI 2018.03 Release Notes](https://aws.amazon.com/amazon-linux-ami/2018.03-release-notes/)
 
+## 20241115
+- al2 ami version: 20241115
+- al2023 ami version: 20241115
+- source al2023 ami: al2023-ami-minimal-2023.6.20241111.0-kernel-6.1-x86_64
+- source al2023 arm ami: al2023-ami-minimal-2023.6.20241111.0-kernel-6.1-arm64
+- distribution al2023 release: 2023.6.20241111
+- enhancement: Bump AL2 and AL2023 runc to 1.1.14 [#341](https://github.com/aws/amazon-ecs-ami/pull/341)
+
+## 20241108
+- ecs version: 1.88.0
+- al2 ami version: 20241108
+- source al2 ami: amzn2-ami-minimal-hvm-2.0.20241031.0-x86_64-ebs
+- source al2 arm ami: amzn2-ami-minimal-hvm-2.0.20241031.0-arm64-ebs
+- source al2 kernel 5.10 ami: amzn2-ami-minimal-hvm-2.0.20241031.0-x86_64-ebs
+- source al2 kernel 5.10 arm ami: amzn2-ami-minimal-hvm-2.0.20241031.0-arm64-ebs
+- al2023 ami version: 20241108
+- source al2023 ami: al2023-ami-minimal-2023.6.20241031.0-kernel-6.1-x86_64
+- source al2023 arm ami: al2023-ami-minimal-2023.6.20241031.0-kernel-6.1-arm64
+- distribution al2023 release: 2023.6.20241031
+- feature: Integrate with Fault Injection Service [#330](https://github.com/aws/amazon-ecs-ami/pull/330)
+
+## 20241031
+- al2023 ami version: 20241031
+- distribution al2023 release: 2023.6.20241028
+
+## 20241023
+- al2 ami version: 20241023
+- enhancement: gpu AMI package update [#328](https://github.com/aws/amazon-ecs-ami/pull/328)
+
+## 20241017
+- ecs version: 1.87.1
+- al2 ami version: 20241017
+- source al2 ami: amzn2-ami-minimal-hvm-2.0.20241014.0-x86_64-ebs
+- source al2 arm ami: amzn2-ami-minimal-hvm-2.0.20241014.0-arm64-ebs
+- source al2 kernel 5.10 ami: amzn2-ami-minimal-hvm-2.0.20241014.0-x86_64-ebs
+- source al2 kernel 5.10 arm ami: amzn2-ami-minimal-hvm-2.0.20241014.0-arm64-ebs
+- al2023 ami version: 20241017
+
+## 20241015
+- al2023 ami version: 20241015
+- source al2023 ami: al2023-ami-minimal-2023.6.20241010.0-kernel-6.1-x86_64
+- source al2023 arm ami: al2023-ami-minimal-2023.6.20241010.0-kernel-6.1-arm64
+- distribution al2023 release: 2023.6.20241010
+
+## 20241010
+- al1 ami version: 20241010
+- al2 ami version: 20241010
+- al2023 ami version: 20241010
+- enhancement: Update exec SSM Agent version to 3.3.859.0
+
+## 20241003
+- al2 ami version: 20241003
+- source al2 ami: amzn2-ami-minimal-hvm-2.0.20241001.0-x86_64-ebs
+- source al2 arm ami: amzn2-ami-minimal-hvm-2.0.20241001.0-arm64-ebs
+- source al2 kernel 5.10 ami: amzn2-ami-minimal-hvm-2.0.20241001.0-x86_64-ebs
+- source al2 kernel 5.10 arm ami: amzn2-ami-minimal-hvm-2.0.20241001.0-arm64-ebs
+- al2023 ami version: 20241003
+- source al2023 ami: al2023-ami-minimal-2023.5.20241001.1-kernel-6.1-x86_64
+- source al2023 arm ami: al2023-ami-minimal-2023.5.20241001.1-kernel-6.1-arm64
+- distribution al2023 release: 2023.5.20241001
+
+## 20241001
+- ecs version: 1.87.0
+- al2 ami version: 20241001
+- al2023 ami version: 20241001
+
+## 20240925
+- al2 ami version: 20240925
+
+## 20240920
+- al2 ami version: 20240920
+- source al2 ami: amzn2-ami-minimal-hvm-2.0.20240916.0-x86_64-ebs
+- source al2 arm ami: amzn2-ami-minimal-hvm-2.0.20240916.0-arm64-ebs
+- source al2 kernel 5.10 ami: amzn2-ami-minimal-hvm-2.0.20240916.0-x86_64-ebs
+- source al2 kernel 5.10 arm ami: amzn2-ami-minimal-hvm-2.0.20240916.0-arm64-ebs
+- bug fix: pin the aws-neuronx-dkms package version to 2.17.17.0 only for al2inf [#315](https://github.com/aws/amazon-ecs-ami/pull/315)
+
+## 20240917
+- al2023 ami version: 20240917
+- source al2023 ami: al2023-ami-minimal-2023.5.20240916.0-kernel-6.1-x86_64
+- source al2023 arm ami: al2023-ami-minimal-2023.5.20240916.0-kernel-6.1-arm64
+- distribution al2023 release: 2023.5.20240916
+
+## 20240909
+- al2 ami version: 20240909
+- source al2 ami: amzn2-ami-minimal-hvm-2.0.20240903.0-x86_64-ebs
+- source al2 arm ami: amzn2-ami-minimal-hvm-2.0.20240903.0-arm64-ebs
+- source al2 kernel 5.10 ami: amzn2-ami-minimal-hvm-2.0.20240903.0-x86_64-ebs
+- source al2 kernel 5.10 arm ami: amzn2-ami-minimal-hvm-2.0.20240903.0-arm64-ebs
+
+## 20240905
+- al2 ami version: 20240905
+- al2023 ami version: 20240905
+- source al2023 ami: al2023-ami-minimal-2023.5.20240903.0-kernel-6.1-x86_64
+- source al2023 arm ami: al2023-ami-minimal-2023.5.20240903.0-kernel-6.1-arm64
+- distribution al2023 release: 2023.5.20240903
+- enhancement: Bump AL2 and AL2023 runc to 1.1.13 [#308](https://github.com/aws/amazon-ecs-ami/pull/308)
+
 ## 20240903
 - ecs version: 1.86.3
 - al2 ami version: 20240903

release-al1.auto.pkrvars.hcl

@@ -1,5 +1,5 @@
-ami_version_al1    = "20240319"
+ami_version_al1    = "20241010"
 ecs_version_al1    = "1.51.0"
 docker_version_al1 = "20.10.13"
-exec_ssm_version   = "3.2.2303.0"
+exec_ssm_version   = "3.3.859.0"
 source_ami_al1     = "amzn-ami-minimal-hvm-2018.03.0.20231218.0-x86_64-ebs"

release-al2.auto.pkrvars.hcl

@@ -1,11 +1,11 @@
-ami_version_al2               = "20240903"
-ecs_agent_version             = "1.86.3"
+ami_version_al2               = "20241115"
+ecs_agent_version             = "1.88.0"
 ecs_init_rev                  = "1"
 docker_version                = "25.0.6"
 containerd_version            = "1.7.20"
-runc_version                  = "1.1.11"
-exec_ssm_version              = "3.2.2303.0"
-source_ami_al2                = "amzn2-ami-minimal-hvm-2.0.20240816.0-x86_64-ebs"
-source_ami_al2arm             = "amzn2-ami-minimal-hvm-2.0.20240816.0-arm64-ebs"
-source_ami_al2kernel5dot10    = "amzn2-ami-minimal-hvm-2.0.20240816.0-x86_64-ebs"
-source_ami_al2kernel5dot10arm = "amzn2-ami-minimal-hvm-2.0.20240816.0-arm64-ebs"
+runc_version                  = "1.1.14"
+exec_ssm_version              = "3.3.859.0"
+source_ami_al2                = "amzn2-ami-minimal-hvm-2.0.20241031.0-x86_64-ebs"
+source_ami_al2arm             = "amzn2-ami-minimal-hvm-2.0.20241031.0-arm64-ebs"
+source_ami_al2kernel5dot10    = "amzn2-ami-minimal-hvm-2.0.20241031.0-x86_64-ebs"
+source_ami_al2kernel5dot10arm = "amzn2-ami-minimal-hvm-2.0.20241031.0-arm64-ebs"

release-al2023.auto.pkrvars.hcl

@@ -1,12 +1,12 @@
-ami_version_al2023          = "20240903"
-ecs_agent_version           = "1.86.3"
+ami_version_al2023          = "20241115"
+ecs_agent_version           = "1.88.0"
 ecs_init_rev                = "1"
 docker_version_al2023       = "25.0.6"
 containerd_version_al2023   = "1.7.20"
-runc_version_al2023         = "1.1.11"
-exec_ssm_version            = "3.2.2303.0"
-source_ami_al2023           = "al2023-ami-minimal-2023.5.20240819.0-kernel-6.1-x86_64"
-source_ami_al2023arm        = "al2023-ami-minimal-2023.5.20240819.0-kernel-6.1-arm64"
+runc_version_al2023         = "1.1.14"
+exec_ssm_version            = "3.3.859.0"
+source_ami_al2023           = "al2023-ami-minimal-2023.6.20241111.0-kernel-6.1-x86_64"
+source_ami_al2023arm        = "al2023-ami-minimal-2023.6.20241111.0-kernel-6.1-arm64"
 kernel_version_al2023       = "-kernel-6.1"
 kernel_version_al2023arm    = "-kernel-6.1"
-distribution_release_al2023 = "2023.5.20240819"
+distribution_release_al2023 = "2023.6.20241111"

scripts/enable-ecs-agent-gpu-support.sh

@@ -140,9 +140,10 @@ else
         xorg-x11-server-Xorg \
         docker-runtime-nvidia \
         oci-add-hooks \
-        libnvidia-container \
+        libnvidia-container1 \
         libnvidia-container-tools \
-        nvidia-container-runtime-hook
+        nvidia-container-toolkit-base \
+        nvidia-container-toolkit
 
     sudo yum install -y cuda-drivers \
         cuda

scripts/enable-ecs-agent-inferentia-support.sh

@@ -27,7 +27,12 @@ sudo mv /tmp/neuron.repo /etc/yum.repos.d/neuron.repo
 sudo yum install kernel-devel-$(uname -r) kernel-headers-$(uname -r) -y
 
 # Install Neuron Driver
-sudo yum install -y aws-neuronx-dkms-2.*
+if [[ $AMI_TYPE == "al2inf" ]]; then
+    # Pin the aws-neuronx-dkms package version to 2.17.17.0 only for al2inf, since the newest versions of the Neuron SDK are no longer supporting linux kernel 4.14
+    sudo yum install -y aws-neuronx-dkms-2.17.17.0
+else
+    sudo yum install -y aws-neuronx-dkms-2.*
+fi
 sudo yum install -y aws-neuronx-oci-hook-2.*
 
 # Install oci-add-hooks

variables.pkr.hcl

@@ -9,8 +9,8 @@ packer {
 
 locals {
   packages_al1    = "amazon-efs-utils ec2-net-utils acpid irqbalance numactl rng-tools docker-storage-setup"
-  packages_al2    = "amazon-efs-utils ec2-net-utils acpid amazon-ssm-agent yum-plugin-upgrade-helper"
-  packages_al2023 = "amazon-efs-utils amazon-ssm-agent amazon-ec2-net-utils acpid"
+  packages_al2    = "amazon-efs-utils ec2-net-utils acpid amazon-ssm-agent yum-plugin-upgrade-helper iproute-tc"
+  packages_al2023 = "amazon-efs-utils amazon-ssm-agent amazon-ec2-net-utils acpid iproute-tc"
 }
 
 variable "ami_name_prefix_al1" {
@@ -60,7 +60,7 @@ variable "block_device_size_gb" {
 variable "ecs_agent_version" {
   type        = string
   description = "ECS agent version to build AMI with."
-  default     = "1.86.3"
+  default     = "1.88.0"
 }
 
 variable "ecs_init_rev" {
@@ -84,7 +84,7 @@ variable "containerd_version" {
 variable "runc_version" {
   type        = string
   description = "Runc version to build AMI with."
-  default     = "1.1.11"
+  default     = "1.1.14"
 }
 
 variable "docker_version_al2023" {
@@ -102,13 +102,13 @@ variable "containerd_version_al2023" {
 variable "runc_version_al2023" {
   type        = string
   description = "Runc version to build AL2023 AMI with."
-  default     = "1.1.11"
+  default     = "1.1.14"
 }
 
 variable "exec_ssm_version" {
   type        = string
   description = "SSM binary version to build ECS exec support with."
-  default     = "3.2.2303.0"
+  default     = "3.3.859.0"
 }
 
 variable "source_ami_al2" {