From 59b7bc065df2c9b40426d6fe78a8ae28e1eafc0c Mon Sep 17 00:00:00 2001 From: Justin Plock Date: Thu, 3 Oct 2024 16:09:39 -0400 Subject: [PATCH] [feat] Install and configure ECR credential helper --- al2/aarch64/standard/2.0/Dockerfile | 4 +++- al2/aarch64/standard/3.0/Dockerfile | 4 +++- al2/x86_64/standard/4.0/Dockerfile | 2 ++ al2/x86_64/standard/5.0/Dockerfile | 2 ++ ubuntu/standard/5.0/Dockerfile | 4 +++- ubuntu/standard/6.0/Dockerfile | 4 +++- ubuntu/standard/7.0/Dockerfile | 4 +++- 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/al2/aarch64/standard/2.0/Dockerfile b/al2/aarch64/standard/2.0/Dockerfile index 0dd6e60..cea1a38 100644 --- a/al2/aarch64/standard/2.0/Dockerfile +++ b/al2/aarch64/standard/2.0/Dockerfile @@ -37,7 +37,9 @@ RUN set -ex \ perl-DBI perl-HTTP-Date perl-IO-Pty-Easy perl-TimeDate perl-YAML-LibYAML perl perl-FindBin \ postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \ subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \ - amazon-ecr-credential-helper runc + amazon-ecr-credential-helper runc \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json RUN useradd codebuild-user diff --git a/al2/aarch64/standard/3.0/Dockerfile b/al2/aarch64/standard/3.0/Dockerfile index 05f4e07..457e122 100644 --- a/al2/aarch64/standard/3.0/Dockerfile +++ b/al2/aarch64/standard/3.0/Dockerfile @@ -36,7 +36,9 @@ RUN set -ex \ postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \ patch pkg-config procps python3-configobj llvm rsync sqlite-devel \ subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \ - amazon-ecr-credential-helper git-lfs runc acl + amazon-ecr-credential-helper git-lfs runc acl \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json RUN useradd codebuild-user diff --git a/al2/x86_64/standard/4.0/Dockerfile b/al2/x86_64/standard/4.0/Dockerfile index 0d9c2c5..5d1b430 100644 --- a/al2/x86_64/standard/4.0/Dockerfile +++ b/al2/x86_64/standard/4.0/Dockerfile @@ -40,6 +40,8 @@ RUN set -ex \ postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \ subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \ amazon-ecr-credential-helper \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json \ && rm /etc/yum.repos.d/mono-centos7-stable.repo RUN useradd codebuild-user diff --git a/al2/x86_64/standard/5.0/Dockerfile b/al2/x86_64/standard/5.0/Dockerfile index 8158902..2ef017e 100644 --- a/al2/x86_64/standard/5.0/Dockerfile +++ b/al2/x86_64/standard/5.0/Dockerfile @@ -37,6 +37,8 @@ RUN set -ex \ postgresql-devel procps-ng python-configobj readline-devel rsync sgml-common \ subversion-perl tar tcl tk vim wget which xfsprogs xmlto xorg-x11-server-Xvfb xz-devel \ amazon-ecr-credential-helper git-lfs acl glibc-langpack-en glibc-common \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json \ && rm /etc/yum.repos.d/mono-centos7-stable.repo RUN useradd codebuild-user diff --git a/ubuntu/standard/5.0/Dockerfile b/ubuntu/standard/5.0/Dockerfile index bad93c3..b053ec8 100644 --- a/ubuntu/standard/5.0/Dockerfile +++ b/ubuntu/standard/5.0/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \ && chmod 600 ~/.ssh/known_hosts \ && apt-get install -y -qq --no-install-recommends \ - apt-utils asciidoc autoconf automake build-essential bzip2 \ + amazon-ecr-credential-helper apt-utils asciidoc autoconf automake build-essential bzip2 \ bzr curl dirmngr docbook-xml docbook-xsl dpkg-dev \ e2fsprogs expect fakeroot file g++ gcc gettext gettext-base \ groff gzip iptables jq less libapr1 libaprutil1 \ @@ -45,6 +45,8 @@ RUN set -ex \ python-openssl rsync sgml-base sgml-data \ tar tcl tcl8.6 tk tk-dev unzip wget xfsprogs xml-core xmlto xsltproc \ libzip5 libzip-dev vim xvfb xz-utils zip zlib1g-dev \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json \ && rm -rf /var/lib/apt/lists/* ENV LC_CTYPE="C.UTF-8" diff --git a/ubuntu/standard/6.0/Dockerfile b/ubuntu/standard/6.0/Dockerfile index e91084d..eac74d2 100644 --- a/ubuntu/standard/6.0/Dockerfile +++ b/ubuntu/standard/6.0/Dockerfile @@ -27,7 +27,7 @@ RUN set -ex \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \ && chmod 600 ~/.ssh/known_hosts \ && apt-get install -y -qq --no-install-recommends \ - apt-utils asciidoc autoconf automake build-essential bzip2 \ + amazon-ecr-credential-helper apt-utils asciidoc autoconf automake build-essential bzip2 \ bzr curl dirmngr docbook-xml docbook-xsl dpkg-dev \ e2fsprogs expect fakeroot file g++ gcc gettext gettext-base \ groff gzip iptables jq less libapr1 libaprutil1 \ @@ -45,6 +45,8 @@ RUN set -ex \ python3-openssl rsync sgml-base sgml-data \ tar tcl tcl8.6 tk tk-dev unzip wget xfsprogs xml-core xmlto xsltproc \ libzip-dev vim xvfb xz-utils zip zlib1g-dev \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json \ && rm -rf /var/lib/apt/lists/* ENV LC_CTYPE="C.UTF-8" diff --git a/ubuntu/standard/7.0/Dockerfile b/ubuntu/standard/7.0/Dockerfile index 26d7917..149dcf0 100644 --- a/ubuntu/standard/7.0/Dockerfile +++ b/ubuntu/standard/7.0/Dockerfile @@ -26,7 +26,7 @@ RUN set -ex \ && ssh-keyscan -t rsa,dsa,ed25519,ecdsa -H bitbucket.org >> ~/.ssh/known_hosts \ && chmod 600 ~/.ssh/known_hosts \ && apt-get install -y -qq --no-install-recommends \ - apt-utils asciidoc autoconf automake build-essential bzip2 \ + amazon-ecr-credential-helper apt-utils asciidoc autoconf automake build-essential bzip2 \ bzr curl dirmngr docbook-xml docbook-xsl dpkg-dev \ e2fsprogs expect fakeroot file g++ gcc gettext gettext-base \ groff gzip iptables jq less libapr1 libaprutil1 \ @@ -44,6 +44,8 @@ RUN set -ex \ python3-openssl rsync sgml-base sgml-data \ tar tcl tcl8.6 tk tk-dev unzip wget xfsprogs xml-core xmlto xsltproc \ libzip-dev vim xvfb xz-utils zip zlib1g-dev git-lfs acl \ + && mkdir ~/.docker \ + && echo '{"credsStore": "ecr-login"}' > ~/.docker/config.json \ && rm -rf /var/lib/apt/lists/* ENV LC_CTYPE="C.UTF-8"