Merge pull request #40 from duplocloud/DUPLO-16826-amazon-ecr-credent…

…ial-helper DUPLO-16826 Add amazon-ecr-credential-helper
duplocloud · May 13, 2024 · 7e0604c · 7e0604c
2 parents 4931240 + 1de41a9
commit 7e0604c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
@@ -42,7 +42,7 @@ jobs:
 
       # AWS credentials
       - name: Packer AWS Role
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
@@ -105,7 +105,7 @@ jobs:
 
       # Upload the image manifest
       - name: Attach Manifest
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: packer-manifest.json
           path: packer-manifest.json
@@ -117,7 +117,7 @@ jobs:
       duplo_token: "${{ secrets.GOVCLOUD_DUPLO_TOKEN }}"
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # AWS credentials
       - name: Tenant AWS JIT
@@ -127,7 +127,7 @@ jobs:
 
       # AWS credentials
       - name: Packer AWS Role
-        uses: aws-actions/configure-aws-credentials@v2
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}

diff --git a/AgentAmazonLinux2/Setup.sh b/AgentAmazonLinux2/Setup.sh
@@ -84,7 +84,7 @@ ubuntuInstall () {
 }
 
 
-installDependancies () {
+installDependencies () {
 
   if [ "$OS" = "centos" ]; then
     echo "Centos Installing docker"
@@ -115,6 +115,8 @@ installDependancies () {
     sudo amazon-linux-extras install -q -y docker
     sudo yum install -q -y docker
     sudo usermod -a -G docker ec2-user
+    sudo yum install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
 
     sudo yum install -q -y git wget curl net-tools vim
     sudo yum install -q -y yum-utils
@@ -139,6 +141,8 @@ installDependancies () {
     echo "Ubuntu Installing Container Management Service"
     sudo apt-get  update
     sudo apt install -q -y  python3-dev python3-pip bridge-utils  python3-virtualenv gcc
+    sudo apt install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
     ###
     options=`cat /etc/default/docker | grep bridge`
     echo $options
@@ -197,7 +201,7 @@ echo "Step 1: Install Docker and setup docker bridge";
 echo "--------------------------OS=$OS VER=$VER-------------------------------------1"
 echo; echo;
 
-installDependancies
+installDependencies
 
 
 

diff --git a/AgentUbuntu20/Setup.sh b/AgentUbuntu20/Setup.sh
@@ -84,7 +84,7 @@ ubuntuInstall () {
 }
 
 
-installDependancies () {
+installDependencies () {
 
   if [ "$OS" = "centos" ]; then
     echo "Centos Installing docker"
@@ -113,6 +113,8 @@ installDependancies () {
     echo "Ubuntu Installing Container Management Service"
     sudo apt-get  update
     sudo apt install -q -y  python3-dev python3-pip bridge-utils  python3-virtualenv gcc
+    sudo apt install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
     ###
     options=`cat /etc/default/docker | grep bridge`
     echo $options
@@ -166,7 +168,7 @@ echo "Step 1: Install Docker and setup docker bridge";
 echo "--------------------------OS=$OS VER=$VER-------------------------------------1"
 echo; echo;
 
-installDependancies
+installDependencies
 
 
 

diff --git a/AgentUbuntu22/Setup.sh b/AgentUbuntu22/Setup.sh
@@ -85,7 +85,7 @@ ubuntuInstall () {
 }
 
 
-installDependancies () {
+installDependencies () {
 
   if [ "$OS" = "centos" ]; then
     echo "Centos Installing docker"
@@ -116,6 +116,8 @@ installDependancies () {
     sudo amazon-linux-extras install -q -y docker
     sudo yum install -q -y docker
     sudo usermod -a -G docker ec2-user
+    sudo yum install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
 
     sudo yum install -q -y git wget curl net-tools vim
     sudo yum install -q -y yum-utils
@@ -140,6 +142,8 @@ installDependancies () {
     echo "Ubuntu Installing Container Management Service"
     sudo apt-get  update
     sudo apt install -q -y  python3-dev python3-pip bridge-utils  python3-virtualenv gcc
+    sudo apt install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
 
     ###
     options=`cat /etc/default/docker | grep bridge`
@@ -205,7 +209,7 @@ echo "Step 1: Install Docker and setup docker bridge";
 echo "--------------------------OS=$OS VER=$VER-------------------------------------1"
 echo; echo;
 
-installDependancies
+installDependencies
 
 
 

diff --git a/AgentUbuntu22/SetupPython3.sh b/AgentUbuntu22/SetupPython3.sh
@@ -88,7 +88,7 @@ ubuntuInstall () {
 }
 
 
-installDependancies () {
+installDependencies () {
 
   if [ "$OS" = "centos" ]; then
     echo "Centos Installing docker"
@@ -119,6 +119,8 @@ installDependancies () {
     sudo amazon-linux-extras install -q -y docker
     sudo yum install -q -y docker
     sudo usermod -a -G docker ec2-user
+    sudo yum install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
 
     sudo yum install -q -y git wget curl net-tools vim
     sudo yum install -q -y yum-utils
@@ -143,6 +145,8 @@ installDependancies () {
     echo "Ubuntu Installing Container Management Service"
     sudo apt-get  update
     sudo apt install -q -y  python3-dev python3-pip bridge-utils  python3-virtualenv gcc
+    sudo apt install -q -y amazon-ecr-credential-helper
+    mkdir -p ~/.docker && echo '{ "credsStore": "ecr-login" }' > ~/.docker/config.json
 
     ###
     options=`cat /etc/default/docker | grep bridge`
@@ -208,7 +212,7 @@ echo "Step 1: Install Docker and setup docker bridge";
 echo "--------------------------OS=$OS VER=$VER-------------------------------------1"
 echo; echo;
 
-installDependancies
+installDependencies
 
 
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 2024-04-18
+
+### Added
+- Installed `amazon-ecr-credential-helper` and configured Docker to use it across Ubuntu 20, Ubuntu 22, and AmazonLinux2 setups.
+
+### Changed
+- Corrected function name typo from `installDependancies` to `installDependencies` in setup scripts.
+- Updated GitHub Actions in the workflow file to use newer versions (v4) for better performance and features.
+
 ## 2024-02-16
 
 ### Added