From 7abfac78a5e72ada40ebd08208b9d9a15c2dbfd9 Mon Sep 17 00:00:00 2001 From: lpearson-trek10 <55448384+lpearson-trek10@users.noreply.github.com> Date: Mon, 26 Jul 2021 11:09:16 -0400 Subject: [PATCH 1/5] Update Dockerfile --- default/Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/default/Dockerfile b/default/Dockerfile index b2e8caf..0e36ba5 100644 --- a/default/Dockerfile +++ b/default/Dockerfile @@ -1,16 +1,16 @@ -FROM amazonlinux:2017.09-with-sources -LABEL maintainer="Jared Short " +FROM public.ecr.aws/amazonlinux/amazonlinux:2.0.20201111.0 +LABEL maintainer="Lucas Pearson " -RUN yum update -y # add nodejs repo -RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - +RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash - RUN yum -y install \ git \ jq \ nodejs \ openssl-devel \ python27-devel.x86_64 \ - python36-devel \ + python3 \ + python3-devel \ gcc \ zlib-devel @@ -18,7 +18,9 @@ RUN yum -y install \ RUN curl -O https://bootstrap.pypa.io/get-pip.py && \ python3 get-pip.py RUN pip install awscli --upgrade -RUN pip install aws-sam-cli # update npm to latest version RUN npm install -g npm + +# Install sam cli +RUN pip install aws-sam-cli From db13d0fbe9b09cdde172a477f88b505435e46fef Mon Sep 17 00:00:00 2001 From: lpearson-trek10 <55448384+lpearson-trek10@users.noreply.github.com> Date: Mon, 26 Jul 2021 11:10:35 -0400 Subject: [PATCH 2/5] Update Dockerfile --- serverless/Dockerfile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/serverless/Dockerfile b/serverless/Dockerfile index b2b4d4e..b781db2 100644 --- a/serverless/Dockerfile +++ b/serverless/Dockerfile @@ -1,27 +1,26 @@ -FROM amazonlinux:with-sources -LABEL maintainer="Jared Short " +FROM public.ecr.aws/amazonlinux/amazonlinux:2.0.20201111.0 +LABEL maintainer="Lucas Pearson " -RUN yum update -y # add nodejs repo -RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - +RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash - RUN yum -y install \ git \ jq \ nodejs \ openssl-devel \ - python-devel.x86_64 \ + python27-devel.x86_64 \ + python3 \ + python3-devel \ + gcc \ zlib-devel # install pip + aws cli RUN curl -O https://bootstrap.pypa.io/get-pip.py && \ - python get-pip.py + python3 get-pip.py RUN pip install awscli --upgrade -# install python 3 -RUN amazon-linux-extras install python3 - # update npm to latest version RUN npm install -g npm # install serverless framework -RUN npm install -g serverless@1.28.0 +RUN npm install -g serverless@2.52.1 From 9ba4606dffa5c27ac0260fc43101faab031808d3 Mon Sep 17 00:00:00 2001 From: lpearson-trek10 <55448384+lpearson-trek10@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:30:07 -0400 Subject: [PATCH 3/5] Update Dockerfile --- default/Dockerfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/default/Dockerfile b/default/Dockerfile index 0e36ba5..086083a 100644 --- a/default/Dockerfile +++ b/default/Dockerfile @@ -4,6 +4,8 @@ LABEL maintainer="Lucas Pearson " # add nodejs repo RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash - RUN yum -y install \ + zip \ + unzip \ git \ jq \ nodejs \ @@ -12,15 +14,30 @@ RUN yum -y install \ python3 \ python3-devel \ gcc \ + libxml2-devel \ + libxslt-devel \ zlib-devel -# install pip + aws cli +# install pip + aws cli + libxml RUN curl -O https://bootstrap.pypa.io/get-pip.py && \ python3 get-pip.py RUN pip install awscli --upgrade +RUN pip install lxml + +# Move aws v1 to its own command awsv1 +RUN mv /usr/local/bin/aws /usr/local/bin/awsv1 + +# Latest version of aws cli +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \ + unzip awscliv2.zip && \ + ./aws/install && \ + rm -rf awscliv2.zip ./aws # update npm to latest version RUN npm install -g npm # Install sam cli RUN pip install aws-sam-cli + +# install org formation +RUN npm install -g --production aws-organization-formation@0.9.17 From ec54962af10c9d321589b6bb5d7c9dc943d751b4 Mon Sep 17 00:00:00 2001 From: lpearson-trek10 <55448384+lpearson-trek10@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:30:25 -0400 Subject: [PATCH 4/5] Update Dockerfile --- serverless/Dockerfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/serverless/Dockerfile b/serverless/Dockerfile index b781db2..6771cc6 100644 --- a/serverless/Dockerfile +++ b/serverless/Dockerfile @@ -4,6 +4,8 @@ LABEL maintainer="Lucas Pearson " # add nodejs repo RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash - RUN yum -y install \ + zip \ + unzip \ git \ jq \ nodejs \ @@ -12,15 +14,30 @@ RUN yum -y install \ python3 \ python3-devel \ gcc \ + libxml2-devel \ + libxslt-devel \ zlib-devel -# install pip + aws cli +# install pip + aws cli + libxml RUN curl -O https://bootstrap.pypa.io/get-pip.py && \ python3 get-pip.py RUN pip install awscli --upgrade +RUN pip install lxml + +# Move aws v1 to its own command awsv1 +RUN mv /usr/local/bin/aws /usr/local/bin/awsv1 + +# Latest version of aws cli +RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \ + unzip awscliv2.zip && \ + ./aws/install && \ + rm -rf awscliv2.zip ./aws # update npm to latest version RUN npm install -g npm # install serverless framework RUN npm install -g serverless@2.52.1 + +# install org formation +RUN npm install -g --production aws-organization-formation@0.9.17 From 4cca80e035728e450917e0506439aa6b65530e92 Mon Sep 17 00:00:00 2001 From: lpearson-trek10 <55448384+lpearson-trek10@users.noreply.github.com> Date: Tue, 3 Aug 2021 16:35:20 -0400 Subject: [PATCH 5/5] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb2b3ab..939978b 100644 --- a/README.md +++ b/README.md @@ -7,5 +7,7 @@ - npm - Serverless - Python -- AWS CLI +- AWS CLI v1 as `awsv1` and v2 as `aws` - jq +- libxml +- Org Formation CLI