From a7d5e6f52b645d7ed37393c5462f46ba7a68f342 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 14:46:50 +0000 Subject: [PATCH 1/2] chore(deps): bump awscli in /packages/@aws-cdk/lambda-layer-awscli Bumps [awscli](https://github.com/aws/aws-cli) from 1.25.70 to 1.27.4. - [Release notes](https://github.com/aws/aws-cli/releases) - [Changelog](https://github.com/aws/aws-cli/blob/develop/CHANGELOG.rst) - [Commits](https://github.com/aws/aws-cli/compare/1.25.70...1.27.4) --- updated-dependencies: - dependency-name: awscli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt b/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt index 7bf3281da0447..b00ae3fde1226 100644 --- a/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt +++ b/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt @@ -1 +1 @@ -awscli==1.25.70 +awscli==1.27.4 From 11bd948d37a0ba25e3d4e3e6cbf7a7a809f0aac1 Mon Sep 17 00:00:00 2001 From: Naumel <104374999+Naumel@users.noreply.github.com> Date: Thu, 10 Nov 2022 11:06:45 +0100 Subject: [PATCH 2/2] Referece 22823 for the changes. --- .../lambda-layer-awscli/layer/.dockerignore | 1 - .../lambda-layer-awscli/layer/Dockerfile | 54 ------------------- .../lambda-layer-awscli/layer/build.sh | 18 ------- .../layer/requirements.txt | 1 - 4 files changed, 74 deletions(-) delete mode 100644 packages/@aws-cdk/lambda-layer-awscli/layer/.dockerignore delete mode 100644 packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile delete mode 100755 packages/@aws-cdk/lambda-layer-awscli/layer/build.sh delete mode 100644 packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/.dockerignore b/packages/@aws-cdk/lambda-layer-awscli/layer/.dockerignore deleted file mode 100644 index 88a84e55aa43b..0000000000000 --- a/packages/@aws-cdk/lambda-layer-awscli/layer/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -build.sh diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile b/packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile deleted file mode 100644 index 04e911d890c89..0000000000000 --- a/packages/@aws-cdk/lambda-layer-awscli/layer/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -FROM public.ecr.aws/sam/build-python3.7 - -USER root -RUN mkdir -p /opt -WORKDIR /tmp - -# -# tools -# - -RUN yum update -y \ - && yum install -y zip unzip wget tar gzip - -# -# aws cli -# - -COPY requirements.txt ./ -RUN python -m pip install -r requirements.txt -t /opt/awscli - -# -# organize for self-contained usage -# - -RUN mv /opt/awscli/bin/aws /opt/awscli - -# -# cleanup -# - -RUN rm -rf \ - /opt/awscli/pip* \ - /opt/awscli/setuptools* \ - && cd /opt/awscli/awscli/examples \ - && rm -rf $(ls | grep -v global_options.rst) - -# -# Test that the CLI works -# - -RUN yum install -y groff -RUN /opt/awscli/aws help - -# -# create the bundle -# - -RUN cd /opt \ - && zip --symlinks -r ../layer.zip * \ - && echo "/layer.zip is ready" \ - && ls -alh /layer.zip; - -WORKDIR / -ENTRYPOINT [ "/bin/bash" ] diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/build.sh b/packages/@aws-cdk/lambda-layer-awscli/layer/build.sh deleted file mode 100755 index edf7d3edfd18d..0000000000000 --- a/packages/@aws-cdk/lambda-layer-awscli/layer/build.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -set -euo pipefail - -cd $(dirname $0) - -echo ">> Building AWS Lambda layer inside a docker image..." - -TAG='aws-lambda-layer' - -docker build -t ${TAG} . - -echo ">> Extracting layer.zip from the build container..." -CONTAINER=$(docker run -d ${TAG} false) -docker cp ${CONTAINER}:/layer.zip ../lib/layer.zip - -echo ">> Stopping container..." -docker rm -f ${CONTAINER} -echo ">> lib/layer.zip is ready" diff --git a/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt b/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt deleted file mode 100644 index b00ae3fde1226..0000000000000 --- a/packages/@aws-cdk/lambda-layer-awscli/layer/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -awscli==1.27.4