Bump minimum required docker version in ecs-init spec file (aws#4732)

* Bump minimum required docker version in ecs-init spec file

* Codebuild job tweaks/fixes

Author: sparrc

build-infrastructure/codebuild-devbuild-stack.yml

@@ -34,7 +34,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (AMD/x86_64). Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'public.ecr.aws/lts/ubuntu:20.04'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: false
@@ -63,7 +63,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (ARM). Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'public.ecr.aws/lts/ubuntu:20.04'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: false
@@ -92,7 +92,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (ARM). Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'aws/codebuild/amazonlinux2-aarch64-standard:3.0'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: true
@@ -121,7 +121,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (AMD/x86_64). Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'aws/codebuild/amazonlinux2-x86_64-standard:5.0'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: true
@@ -136,7 +136,7 @@ Resources:
       TimeoutInMinutes: 60
       Visibility: PRIVATE
 
-  # Creates a CodeBuild project for Amazon Linux 2 ARM    
+  # Creates a CodeBuild project for Amazon Linux 2 ARM
   Amzn2ArmProject:
     Type: 'AWS::CodeBuild::Project'
     Properties:
@@ -152,7 +152,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (ARM) on Amazon Linux 2. Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3.
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'aws/codebuild/amazonlinux2-aarch64-standard:2.0'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: true
@@ -183,7 +183,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (AMD/x86_64) on Amazon Linux 2. Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3.
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'aws/codebuild/amazonlinux2-x86_64-standard:4.0'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: true
@@ -214,7 +214,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (ARM) on Amazon-Linux 2023. Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3.
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'aws/codebuild/amazonlinux2-aarch64-standard:3.0'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: true
@@ -245,7 +245,7 @@ Resources:
       ConcurrentBuildLimit: 10
       Description: A CodeBuild project to build artifacts (AMD/x86_64) on Amazon-Linux 2023. Builds are triggered by PR creation, updates, and merges, and artifacts are saved in S3.
       Environment:
-        ComputeType: BUILD_GENERAL1_SMALL
+        ComputeType: BUILD_GENERAL1_MEDIUM
         Image: 'aws/codebuild/amazonlinux2-x86_64-standard:5.0'
         ImagePullCredentialsType: CODEBUILD
         PrivilegedMode: true
@@ -258,8 +258,8 @@ Resources:
         Location: !Ref GithubFullRepoName
         Type: GITHUB
       TimeoutInMinutes: 60
-      Visibility: PRIVATE     
-  
+      Visibility: PRIVATE
+
   # Defines the service roles for the CodeBuild projects
   ServiceRoleAmd:
     Type: 'AWS::IAM::Role'
@@ -303,7 +303,7 @@ Resources:
                   - 's3:GetBucketAcl'
                   - 's3:GetBucketLocation'
           PolicyName: !Sub '${AWS::StackName}-ServicePolicyAmd'
-      RoleName: !Sub '${AWS::StackName}-ServiceRoleAmd'   
+      RoleName: !Sub '${AWS::StackName}-ServiceRoleAmd'
   ServiceRoleUbuntuAmd:
     Type: 'AWS::IAM::Role'
     Properties:
@@ -432,7 +432,7 @@ Resources:
                   - 's3:GetBucketAcl'
                   - 's3:GetBucketLocation'
           PolicyName: !Sub '${AWS::StackName}-ServicePolicyUbuntuArm'
-      RoleName: !Sub '${AWS::StackName}-ServiceRoleUbuntuArm'   
+      RoleName: !Sub '${AWS::StackName}-ServiceRoleUbuntuArm'
   ServiceRoleAmzn2Arm:
     Type: 'AWS::IAM::Role'
     Properties:

buildspecs/pr-build-amzn.yml

@@ -49,23 +49,20 @@ phases:
       # Need to install GOLANG explicitly as required versions do not come preinstalled
       # Remove existing go installation (goenv utility)
       - sudo rm -rf /root/.goenv
-      - sudo rm -rf /usr/local/go/bin/go 
+      - sudo rm -rf /usr/local/go/bin/go
 
-      # Define the Go version to install
-      - GOVERSION="$(cat GO_VERSION)"
-      
       # Install Go and define variables based on Amazon Linux version (2 or 2023)
       # Amazon Linux 2023 uses package manager DNF, while older versions use YUM
       # Set the appropriate AL23 version echo string to include in build log
       - |
         if [[ "$amzn_version" = "amzn2023" ]]; then
           sudo dnf --releasever="$AL23_VERSION" update -y
-          sudo dnf install -y golang-$GOVERSION
+          sudo dnf install -y golang
           echo "Amazon Linux 2023 Version: $AL23_VERSION" 2>&1 | tee -a $BUILD_LOG
-          
+
         elif [[ "$amzn_version" = "amzn2" ]]; then
-          sudo yum install -y golang-$GOVERSION
-          
+          sudo yum install -y golang
+
         else
           echo "Unsupported Amazon Linux version"
           exit 1
@@ -74,10 +71,10 @@ phases:
       # Define the log file with AL version (amzn2 or amzn23) and the architecture
       - BUILD_LOG="build_${amzn_version}_${architecture}.log"
 
-      # Print all environment variables to the log file 
+      # Print all environment variables to the log file
       - which go | tee -a $BUILD_LOG
       - go version | tee -a $BUILD_LOG
-      
+
   build:
     commands:
       # Print the current working directory to the log file
@@ -108,7 +105,7 @@ phases:
           AMZN_LINUX_RPM="ecs-init-${AGENT_VERSION}-1.${amzn_version}.aarch64.rpm"
         fi
 
-      # List directory files to view artifacts in build log 
+      # List directory files to view artifacts in build log
       - ls
 
   post_build:
@@ -118,4 +115,4 @@ artifacts:
   files:
     - $AMZN_LINUX_RPM
     - $BUILD_LOG
-  name: $CODEBUILD_RESOLVED_SOURCE_VERSION
+  name: $CODEBUILD_RESOLVED_SOURCE_VERSION

packaging/amazon-linux-ami-integrated/ecs-agent.spec

@@ -50,7 +50,7 @@ Requires:       systemd
 Requires:       upstart
 %endif
 Requires:       iptables
-Requires:       docker >= 17.06.2ce
+Requires:       docker >= 20.10.0
 Requires:       procps
 
 # The following 'Provides' lists the vendored dependencies bundled in