Add ec2-user to docker group, package fixups (aws#10)

ec2-user needs to be added to the docker group to ensure that the 'docker' binary can be run without 'sudo'. packages were fixed up to be consistent with current AMIs.
varunm17 · Nov 9, 2021 · 7c2c018 · 7c2c018
1 parent d6a209e
commit 7c2c018
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 deletions.
diff --git a/al1.pkr.hcl b/al1.pkr.hcl
@@ -83,7 +83,7 @@ build {
   provisioner "shell" {
     inline_shebang = "/bin/sh -ex"
     inline = [
-      "sudo yum install -y docker-${var.docker_version_al1} ecs-init-${var.ecs_version_al1} ${local.packages} docker-storage-setup"
+      "sudo yum install -y docker-${var.docker_version_al1} ecs-init-${var.ecs_version_al1} ${local.packages_al1}"
     ]
   }
 
@@ -116,6 +116,13 @@ build {
     script = "scripts/append-efs-client-info.sh"
   }
 
+  provisioner "shell" {
+    inline_shebang = "/bin/sh -ex"
+    inline = [
+      "sudo usermod -a -G docker ec2-user"
+    ]
+  }
+
   provisioner "shell" {
     script = "scripts/cleanup.sh"
   }

diff --git a/al2.pkr.hcl b/al2.pkr.hcl
@@ -46,7 +46,8 @@ build {
   provisioner "shell" {
     inline_shebang = "/bin/sh -ex"
     inline = [
-      "sudo mv /tmp/90_ecs.cfg /etc/cloud/cloud.cfg.d/90_ecs.cfg"
+      "sudo mv /tmp/90_ecs.cfg /etc/cloud/cloud.cfg.d/90_ecs.cfg",
+      "sudo chown root:root /etc/cloud/cloud.cfg.d/90_ecs.cfg"
     ]
   }
 
@@ -159,6 +160,13 @@ build {
     script = "scripts/enable-ecs-agent-gpu-support.sh"
   }
 
+  provisioner "shell" {
+    inline_shebang = "/bin/sh -ex"
+    inline = [
+      "sudo usermod -a -G docker ec2-user"
+    ]
+  }
+
   provisioner "shell" {
     script = "scripts/enable-services.sh"
   }

diff --git a/files/90_ecs.cfg.amzn2 b/files/90_ecs.cfg.amzn2
@@ -2,3 +2,4 @@
 system_info:
   default_user:
     groups: [ "wheel", "docker" ]
+
diff --git a/release.auto.pkrvars.hcl b/release.auto.pkrvars.hcl
@@ -1,4 +1,4 @@
-ami_version        = "20211106"
+ami_version        = "20210101"
 source_ami_al2     = "amzn2-ami-minimal-hvm-2.0.20211005.0-x86_64-ebs"
 source_ami_al2arm  = "amzn2-ami-minimal-hvm-2.0.20211005.0-arm64-ebs"
 ecs_agent_version  = "1.57.0"

diff --git a/variables.pkr.hcl b/variables.pkr.hcl
@@ -8,7 +8,8 @@ packer {
 }
 
 locals {
-  packages = "amazon-efs-utils ec2-net-utils acpid amazon-ssm-agent"
+  packages_al1 = "amazon-efs-utils ec2-net-utils acpid irqbalance numactl rng-tools docker-storage-setup"
+  packages     = "amazon-efs-utils ec2-net-utils acpid amazon-ssm-agent yum-plugin-upgrade-helper"
 }
 
 variable "ami_name_prefix_al2" {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		system_info:
		default_user:
		groups: [ "wheel", "docker" ]