From a03bff0038d6ae2bcfdddc4e61d156b535f9606e Mon Sep 17 00:00:00 2001 From: Timo Schilling Date: Sun, 21 Jun 2020 19:19:05 +0200 Subject: [PATCH 01/83] set BUNDLE_SILENCE_ROOT_WARNING=1 for all ruby container (#286) --- ruby2.5/build/Dockerfile | 3 ++- ruby2.7/build/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 79bfcec0..f6d5cbd0 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -5,7 +5,8 @@ ENV PATH=/var/lang/bin:$PATH \ AWS_EXECUTION_ENV=AWS_Lambda_ruby2.5 \ GEM_HOME=/var/runtime \ GEM_PATH=/var/task/vendor/bundle/ruby/2.5.0:/opt/ruby/gems/2.5.0:/var/lang/lib/ruby/gems/2.5.0 \ - RUBYLIB=/var/task:/var/runtime/lib:/opt/ruby/lib + RUBYLIB=/var/task:/var/runtime/lib:/opt/ruby/lib \ + BUNDLE_SILENCE_ROOT_WARNING=1 RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/ruby2.5.tgz | tar -zx -C / diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 8cb421e9..3728daf2 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -5,7 +5,8 @@ ENV PATH=/var/lang/bin:$PATH \ AWS_EXECUTION_ENV=AWS_Lambda_ruby2.7 \ GEM_HOME=/var/runtime \ GEM_PATH=/var/task/vendor/bundle/ruby/2.7.0:/opt/ruby/gems/2.7.0:/var/lang/lib/ruby/gems/2.7.0 \ - RUBYLIB=/var/task:/var/runtime/lib:/opt/ruby/lib + RUBYLIB=/var/task:/var/runtime/lib:/opt/ruby/lib \ + BUNDLE_SILENCE_ROOT_WARNING=1 RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/ruby2.7.tgz | tar -zx -C / From c1af16ade5fe7b6b0cf094202e7aa5793d7b0320 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 23 Jun 2020 14:34:14 -0400 Subject: [PATCH 02/83] Create FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..b7fdd974 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +github: mhart From 38f12c4df00ba1ed48d12c0318494a975a5f04d0 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 24 Jun 2020 11:28:28 -0400 Subject: [PATCH 03/83] yum-plugin-ovl is now included in Amazon Linux 1 Lambdas --- base/build/Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/base/build/Dockerfile b/base/build/Dockerfile index 99fa4bc2..e2a6fa1d 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -4,16 +4,7 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin # A couple of packages are either missing critical-ish files, or didn't make it into the tar RUN chmod 1777 /tmp && \ - /usr/bin/python3 -c "from configparser import SafeConfigParser; \ -yum_conf = SafeConfigParser(); \ -yum_conf.read('/etc/yum.conf'); \ -yum_conf.has_section('main') or yum_conf.add_section('main'); \ -yum_conf.set('main', 'plugins', '1'); \ -f = open('/etc/yum.conf', 'w'); \ -yum_conf.write(f); \ -f.close();" && \ rpm --rebuilddb && \ - yum install -y yum-plugin-ovl && \ yum reinstall -y setup pam shadow-utils audit-libs openssl glibc-common glibc && \ yum groupinstall -y development && \ yum install -y clang cmake docker python27-devel python36-devel \ From a88dcb4162d4e85e0d59db7f9735f704e976b3f1 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 24 Jun 2020 11:33:14 -0400 Subject: [PATCH 04/83] Update amzn1 packages --- base/amazonlinux1.txt | 36 ++++++++++++++++----------------- base/packages.txt | 47 ++++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/base/amazonlinux1.txt b/base/amazonlinux1.txt index 773aa0bc..dbb5fa6d 100644 --- a/base/amazonlinux1.txt +++ b/base/amazonlinux1.txt @@ -1,7 +1,7 @@ basesystem-10.0-4.9.amzn1.noarch bash-4.2.46-28.37.amzn1.x86_64 bzip2-libs-1.0.6-8.12.amzn1.x86_64 -ca-certificates-2018.2.22-65.1.21.amzn1.noarch +ca-certificates-2018.2.22-65.1.22.amzn1.noarch chkconfig-1.3.49.3-2.14.amzn1.x86_64 coreutils-8.22-15.52.amzn1.x86_64 curl-7.61.1-12.93.amzn1.x86_64 @@ -9,14 +9,14 @@ cyrus-sasl-lib-2.1.23-13.16.amzn1.x86_64 db4-4.7.25-18.11.amzn1.x86_64 db4-utils-4.7.25-18.11.amzn1.x86_64 elfutils-libelf-0.168-8.19.amzn1.x86_64 -expat-2.1.0-10.21.amzn1.x86_64 -file-libs-5.37-8.48.amzn1.x86_64 +expat-2.1.0-11.22.amzn1.x86_64 +file-libs-5.37-8.49.amzn1.x86_64 filesystem-2.4.30-3.8.amzn1.x86_64 gawk-3.1.7-10.10.amzn1.x86_64 gdbm-1.8.0-36.6.amzn1.x86_64 glib2-2.36.3-5.21.amzn1.x86_64 -glibc-2.17-292.178.amzn1.x86_64 -glibc-common-2.17-292.178.amzn1.x86_64 +glibc-2.17-292.180.amzn1.x86_64 +glibc-common-2.17-292.180.amzn1.x86_64 gmp-6.0.0-11.16.amzn1.x86_64 gnupg2-2.0.28-2.33.amzn1.x86_64 gpgme-1.4.3-5.15.amzn1.x86_64 @@ -24,7 +24,7 @@ grep-2.20-3.18.amzn1.x86_64 gzip-1.5-9.19.amzn1.x86_64 info-5.1-4.10.amzn1.x86_64 keyutils-libs-1.5.8-3.12.amzn1.x86_64 -krb5-libs-1.15.1-34.44.amzn1.x86_64 +krb5-libs-1.15.1-46.48.amzn1.x86_64 libacl-2.2.49-6.11.amzn1.x86_64 libassuan-2.0.3-3.3.amzn1.x86_64 libattr-2.4.46-12.10.amzn1.x86_64 @@ -35,7 +35,7 @@ libffi-3.0.13-16.5.amzn1.x86_64 libgcc72-7.2.1-2.59.amzn1.x86_64 libgcrypt-1.5.3-12.19.amzn1.x86_64 libgpg-error-1.11-1.12.amzn1.x86_64 -libicu-50.1.2-11.12.amzn1.x86_64 +libicu-50.2-4.0.amzn1.x86_64 libidn2-2.3.0-1.4.amzn1.x86_64 libnghttp2-1.31.1-2.5.amzn1.x86_64 libpsl-0.6.2-1.2.amzn1.x86_64 @@ -53,16 +53,16 @@ make-3.82-21.10.amzn1.x86_64 ncurses-5.7-4.20090207.14.amzn1.x86_64 ncurses-base-5.7-4.20090207.14.amzn1.x86_64 ncurses-libs-5.7-4.20090207.14.amzn1.x86_64 -nspr-4.19.0-1.43.amzn1.x86_64 -nss-3.36.0-5.82.amzn1.x86_64 +nspr-4.21.0-1.43.amzn1.x86_64 +nss-3.44.0-7.84.amzn1.x86_64 nss-pem-1.0.3-4.3.amzn1.x86_64 -nss-softokn-3.36.0-5.42.amzn1.x86_64 -nss-softokn-freebl-3.36.0-5.42.amzn1.x86_64 -nss-sysinit-3.36.0-5.82.amzn1.x86_64 -nss-tools-3.36.0-5.82.amzn1.x86_64 -nss-util-3.36.0-1.54.amzn1.x86_64 +nss-softokn-3.44.0-8.44.amzn1.x86_64 +nss-softokn-freebl-3.44.0-8.44.amzn1.x86_64 +nss-sysinit-3.44.0-7.84.amzn1.x86_64 +nss-tools-3.44.0-7.84.amzn1.x86_64 +nss-util-3.44.0-4.56.amzn1.x86_64 openldap-2.4.40-16.31.amzn1.x86_64 -openssl-1.0.2k-16.150.amzn1.x86_64 +openssl-1.0.2k-16.151.amzn1.x86_64 p11-kit-0.18.5-2.3.amzn1.x86_64 p11-kit-trust-0.18.5-2.3.amzn1.x86_64 pcre-8.21-7.8.amzn1.x86_64 @@ -70,11 +70,11 @@ pinentry-0.7.6-6.11.amzn1.x86_64 pkgconfig-0.27.1-2.7.amzn1.x86_64 popt-1.13-7.7.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.16-1.131.amzn1.x86_64 +python27-2.7.18-1.137.amzn1.x86_64 python27-chardet-2.0.1-7.7.amzn1.noarch python27-iniparse-0.3.1-2.1.9.amzn1.noarch python27-kitchen-1.1.1-5.6.amzn1.noarch -python27-libs-2.7.16-1.131.amzn1.x86_64 +python27-libs-2.7.18-1.137.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 @@ -94,7 +94,7 @@ system-release-2018.03-0.0.noarch tar-1.26-31.22.amzn1.x86_64 tzdata-2019c-1.73.amzn1.noarch xz-libs-5.2.2-1.13.amzn1.x86_64 -yum-3.4.3-150.70.amzn1.noarch +yum-3.4.3-150.71.amzn1.noarch yum-metadata-parser-1.1.4-10.20.amzn1.x86_64 yum-plugin-ovl-1.1.31-46.30.amzn1.noarch yum-plugin-priorities-1.1.31-46.30.amzn1.noarch diff --git a/base/packages.txt b/base/packages.txt index e29e8ab5..a4d5ef92 100644 --- a/base/packages.txt +++ b/base/packages.txt @@ -7,7 +7,7 @@ bash-4.2.46-28.37.amzn1.x86_64 binutils-2.25.1-31.base.66.amzn1.x86_64 bzip2-1.0.6-8.12.amzn1.x86_64 bzip2-libs-1.0.6-8.12.amzn1.x86_64 -ca-certificates-2018.2.22-65.1.21.amzn1.noarch +ca-certificates-2018.2.22-65.1.22.amzn1.noarch cairo-1.12.14-6.8.amzn1.x86_64 chkconfig-1.3.49.3-2.14.amzn1.x86_64 compat-gmp4-4.3.2-1.14.amzn1.x86_64 @@ -27,21 +27,21 @@ dejavu-sans-fonts-2.33-6.6.amzn1.noarch dejavu-serif-fonts-2.33-6.6.amzn1.noarch diffutils-3.3-4.15.amzn1.x86_64 elfutils-libelf-0.168-8.19.amzn1.x86_64 -expat-2.1.0-10.21.amzn1.x86_64 -file-5.37-8.48.amzn1.x86_64 -file-libs-5.37-8.48.amzn1.x86_64 +expat-2.1.0-11.22.amzn1.x86_64 +file-5.37-8.49.amzn1.x86_64 +file-libs-5.37-8.49.amzn1.x86_64 filesystem-2.4.30-3.8.amzn1.x86_64 findutils-4.4.2-6.9.amzn1.x86_64 fontconfig-2.8.0-5.8.amzn1.x86_64 fontpackages-filesystem-1.41-1.1.2.amzn1.noarch -freetype-2.3.11-15.14.amzn1.x86_64 +freetype-2.3.11-19.15.amzn1.x86_64 gawk-3.1.7-10.10.amzn1.x86_64 gdbm-1.8.0-36.6.amzn1.x86_64 ghostscript-fonts-5.50-23.2.7.amzn1.noarch giflib-4.1.6-3.1.6.amzn1.x86_64 glib2-2.36.3-5.21.amzn1.x86_64 -glibc-2.17-292.178.amzn1.x86_64 -glibc-common-2.17-292.178.amzn1.x86_64 +glibc-2.17-292.180.amzn1.x86_64 +glibc-common-2.17-292.180.amzn1.x86_64 gmp-6.0.0-11.16.amzn1.x86_64 gnupg2-2.0.28-2.33.amzn1.x86_64 gnutls-2.12.23-21.18.amzn1.x86_64 @@ -60,7 +60,7 @@ jpackage-utils-1.7.5-27.17.amzn1.noarch keyutils-libs-1.5.8-3.12.amzn1.x86_64 kmod-14-10.10.amzn1.x86_64 kmod-libs-14-10.10.amzn1.x86_64 -krb5-libs-1.15.1-34.44.amzn1.x86_64 +krb5-libs-1.15.1-46.48.amzn1.x86_64 lcms2-2.6-2.5.amzn1.x86_64 libICE-1.0.6-1.4.amzn1.x86_64 libSM-1.2.1-2.6.amzn1.x86_64 @@ -94,7 +94,7 @@ libglvnd-0.2.999-14.20170308git8e6e102.3.amzn1.x86_64 libglvnd-glx-0.2.999-14.20170308git8e6e102.3.amzn1.x86_64 libgomp-6.4.1-1.45.amzn1.x86_64 libgpg-error-1.11-1.12.amzn1.x86_64 -libicu-50.1.2-11.12.amzn1.x86_64 +libicu-50.2-4.0.amzn1.x86_64 libidn2-2.3.0-1.4.amzn1.x86_64 libjpeg-turbo-1.2.90-8.16.amzn1.x86_64 libmount-2.23.2-59.29.amzn1.x86_64 @@ -132,16 +132,16 @@ mesa-libglapi-17.1.5-2.41.amzn1.x86_64 ncurses-5.7-4.20090207.14.amzn1.x86_64 ncurses-base-5.7-4.20090207.14.amzn1.x86_64 ncurses-libs-5.7-4.20090207.14.amzn1.x86_64 -nspr-4.19.0-1.43.amzn1.x86_64 -nss-3.36.0-5.82.amzn1.x86_64 +nspr-4.21.0-1.43.amzn1.x86_64 +nss-3.44.0-7.84.amzn1.x86_64 nss-pem-1.0.3-4.3.amzn1.x86_64 -nss-softokn-3.36.0-5.42.amzn1.x86_64 -nss-softokn-freebl-3.36.0-5.42.amzn1.x86_64 -nss-sysinit-3.36.0-5.82.amzn1.x86_64 -nss-tools-3.36.0-5.82.amzn1.x86_64 -nss-util-3.36.0-1.54.amzn1.x86_64 +nss-softokn-3.44.0-8.44.amzn1.x86_64 +nss-softokn-freebl-3.44.0-8.44.amzn1.x86_64 +nss-sysinit-3.44.0-7.84.amzn1.x86_64 +nss-tools-3.44.0-7.84.amzn1.x86_64 +nss-util-3.44.0-4.56.amzn1.x86_64 openldap-2.4.40-16.31.amzn1.x86_64 -openssl-1.0.2k-16.150.amzn1.x86_64 +openssl-1.0.2k-16.151.amzn1.x86_64 p11-kit-0.18.5-2.3.amzn1.x86_64 p11-kit-trust-0.18.5-2.3.amzn1.x86_64 pam-1.1.8-12.33.amzn1.x86_64 @@ -181,17 +181,17 @@ popt-1.13-7.7.amzn1.x86_64 procps-3.2.8-45.16.amzn1.x86_64 psmisc-22.20-8.12.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.16-1.130.amzn1.x86_64 +python27-2.7.18-1.137.amzn1.x86_64 python27-iniparse-0.3.1-2.1.9.amzn1.noarch -python27-libs-2.7.16-1.130.amzn1.x86_64 +python27-libs-2.7.18-1.137.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 python27-pyxattr-0.5.0-1.6.amzn1.x86_64 python27-urlgrabber-3.10-8.16.amzn1.noarch -python36-3.6.8-1.15.amzn1.x86_64 -python36-libs-3.6.8-1.15.amzn1.x86_64 -python36-pip-9.0.3-1.26.amzn1.noarch +python36-3.6.10-1.16.amzn1.x86_64 +python36-libs-3.6.10-1.16.amzn1.x86_64 +python36-pip-9.0.3-1.27.amzn1.noarch python36-setuptools-36.2.7-1.33.amzn1.noarch readline-6.2-9.14.amzn1.x86_64 rpm-4.11.3-40.76.amzn1.x86_64 @@ -217,7 +217,8 @@ xorg-x11-font-utils-7.2-11.5.amzn1.x86_64 xorg-x11-fonts-Type1-7.2-9.1.5.amzn1.noarch xz-5.2.2-1.13.amzn1.x86_64 xz-libs-5.2.2-1.13.amzn1.x86_64 -yum-3.4.3-150.70.amzn1.noarch +yum-3.4.3-150.71.amzn1.noarch yum-metadata-parser-1.1.4-10.20.amzn1.x86_64 +yum-plugin-ovl-1.1.31-46.30.amzn1.noarch yum-plugin-priorities-1.1.31-46.30.amzn1.noarch zlib-1.2.8-7.18.amzn1.x86_64 From 178462ae977e424f3b9bb929a5a8eec256f22bcb Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 24 Jun 2020 11:39:31 -0400 Subject: [PATCH 05/83] Update amzn2 packages --- base/base-2/amazonlinux2.txt | 32 +++++++++++++------------- base/base-2/diff.txt | 44 ++++++++++++++++++------------------ base/base-2/packages.txt | 16 ++++++------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/base/base-2/amazonlinux2.txt b/base/base-2/amazonlinux2.txt index 9519274b..b6f2420b 100644 --- a/base/base-2/amazonlinux2.txt +++ b/base/base-2/amazonlinux2.txt @@ -1,8 +1,8 @@ -amazon-linux-extras-1.6.9-2.amzn2.noarch +amazon-linux-extras-1.6.11-1.amzn2.noarch basesystem-10.0-7.amzn2.0.1.noarch bash-4.2.46-33.amzn2.x86_64 bzip2-libs-1.0.6-13.amzn2.0.2.x86_64 -ca-certificates-2019.2.32-76.amzn2.0.1.noarch +ca-certificates-2019.2.32-76.amzn2.0.2.noarch chkconfig-1.7.4-1.amzn2.0.2.x86_64 coreutils-8.22-24.amzn2.x86_64 cpio-2.11-27.amzn2.x86_64 @@ -13,16 +13,16 @@ elfutils-libelf-0.176-2.amzn2.x86_64 expat-2.1.0-10.amzn2.0.2.x86_64 file-libs-5.11-35.amzn2.0.2.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 -findutils-4.5.11-5.amzn2.0.2.x86_64 +findutils-4.5.11-6.amzn2.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 gdbm-1.13-6.amzn2.0.2.x86_64 -glib2-2.56.1-4.amzn2.x86_64 +glib2-2.56.1-5.amzn2.0.1.x86_64 glibc-2.26-34.amzn2.x86_64 glibc-common-2.26-34.amzn2.x86_64 glibc-langpack-en-2.26-34.amzn2.x86_64 glibc-minimal-langpack-2.26-34.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 -gnupg2-2.0.22-5.amzn2.0.3.x86_64 +gnupg2-2.0.22-5.amzn2.0.4.x86_64 gpgme-1.3.2-5.amzn2.0.2.x86_64 grep-2.20-3.amzn2.0.2.x86_64 info-5.1-5.amzn2.x86_64 @@ -68,7 +68,7 @@ nss-sysinit-3.44.0-7.amzn2.x86_64 nss-tools-3.44.0-7.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 openldap-2.4.44-15.amzn2.x86_64 -openssl-libs-1.0.2k-19.amzn2.0.1.x86_64 +openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 p11-kit-0.23.5-3.amzn2.0.2.x86_64 p11-kit-trust-0.23.5-3.amzn2.0.2.x86_64 pcre-8.32-17.amzn2.0.2.x86_64 @@ -77,27 +77,27 @@ popt-1.13-16.amzn2.0.2.x86_64 pth-2.0.7-23.amzn2.0.2.x86_64 pygpgme-0.3-9.amzn2.0.2.x86_64 pyliblzma-0.5.3-11.amzn2.0.2.x86_64 -python-2.7.16-5.amzn2.x86_64 +python-2.7.18-1.amzn2.x86_64 python-iniparse-0.4-9.amzn2.noarch -python-libs-2.7.16-5.amzn2.x86_64 +python-libs-2.7.18-1.amzn2.x86_64 python-pycurl-7.19.0-19.amzn2.0.2.x86_64 python-urlgrabber-3.10-9.amzn2.0.1.noarch -python2-rpm-4.11.3-40.amzn2.0.3.x86_64 +python2-rpm-4.11.3-40.amzn2.0.4.x86_64 pyxattr-0.5.1-5.amzn2.0.2.x86_64 readline-6.2-10.amzn2.0.2.x86_64 -rpm-4.11.3-40.amzn2.0.3.x86_64 -rpm-build-libs-4.11.3-40.amzn2.0.3.x86_64 -rpm-libs-4.11.3-40.amzn2.0.3.x86_64 +rpm-4.11.3-40.amzn2.0.4.x86_64 +rpm-build-libs-4.11.3-40.amzn2.0.4.x86_64 +rpm-libs-4.11.3-40.amzn2.0.4.x86_64 sed-4.2.2-5.amzn2.0.2.x86_64 -setup-2.8.71-10.amzn2.noarch +setup-2.8.71-10.amzn2.0.1.noarch shared-mime-info-1.8-4.amzn2.x86_64 -sqlite-3.7.17-8.amzn2.0.2.x86_64 +sqlite-3.7.17-8.amzn2.1.1.x86_64 system-release-2-11.amzn2.x86_64 tzdata-2019c-1.amzn2.noarch vim-minimal-8.1.1602-1.amzn2.x86_64 xz-libs-5.2.2-1.amzn2.0.2.x86_64 -yum-3.4.3-158.amzn2.0.3.noarch +yum-3.4.3-158.amzn2.0.4.noarch yum-metadata-parser-1.1.4-10.amzn2.0.2.x86_64 yum-plugin-ovl-1.1.31-46.amzn2.0.1.noarch yum-plugin-priorities-1.1.31-46.amzn2.0.1.noarch -zlib-1.2.7-17.amzn2.0.2.x86_64 +zlib-1.2.7-18.amzn2.x86_64 diff --git a/base/base-2/diff.txt b/base/base-2/diff.txt index cb9feacb..02234165 100644 --- a/base/base-2/diff.txt +++ b/base/base-2/diff.txt @@ -1,27 +1,27 @@ -amazon-linux-extras-1.6.9-2.amzn2.noarch +amazon-linux-extras-1.6.11-1.amzn2.noarch bzip2-libs-1.0.6-13.amzn2.0.2.x86_64 cpio-2.11-27.amzn2.x86_64 curl-7.61.1-12.amzn2.0.1.x86_64 cyrus-sasl-lib-2.1.26-23.amzn2.x86_64 -diffutils-3.3-4.amzn2.0.2.x86_64 +diffutils-3.3-5.amzn2.x86_64 elfutils-libelf-0.176-2.amzn2.x86_64 expat-2.1.0-10.amzn2.0.2.x86_64 -file-libs-5.11-33.amzn2.0.2.x86_64 -findutils-4.5.11-5.amzn2.0.2.x86_64 +file-libs-5.11-35.amzn2.0.2.x86_64 +findutils-4.5.11-6.amzn2.x86_64 gdbm-1.13-6.amzn2.0.2.x86_64 -glib2-2.56.1-4.amzn2.x86_64 -glibc-langpack-en-2.26-32.amzn2.0.2.x86_64 -gnupg2-2.0.22-5.amzn2.0.3.x86_64 +glib2-2.56.1-5.amzn2.0.1.x86_64 +glibc-langpack-en-2.26-34.amzn2.x86_64 +gnupg2-2.0.22-5.amzn2.0.4.x86_64 gpgme-1.3.2-5.amzn2.0.2.x86_64 libassuan-2.1.0-3.amzn2.0.2.x86_64 libblkid-2.30.2-2.amzn2.0.4.x86_64 -libcrypt-2.26-32.amzn2.0.2.x86_64 +libcrypt-2.26-34.amzn2.x86_64 libcurl-7.61.1-12.amzn2.0.1.x86_64 libdb-5.3.21-24.amzn2.0.3.x86_64 libdb-utils-5.3.21-24.amzn2.0.3.x86_64 libgcrypt-1.5.3-14.amzn2.0.2.x86_64 libgpg-error-1.12-3.amzn2.0.3.x86_64 -libidn2-2.0.4-1.amzn2.0.2.x86_64 +libidn2-2.3.0-1.amzn2.x86_64 libmetalink-0.1.2-7.amzn2.0.2.x86_64 libmount-2.30.2-2.amzn2.0.4.x86_64 libnghttp2-1.39.2-1.amzn2.x86_64 @@ -30,32 +30,32 @@ libunistring-0.9.3-9.amzn2.0.2.x86_64 libuuid-2.30.2-2.amzn2.0.4.x86_64 libxml2-2.9.1-6.amzn2.3.3.x86_64 lua-5.1.4-15.amzn2.0.2.x86_64 -nss-3.44.0-4.amzn2.0.2.x86_64 +nss-3.44.0-7.amzn2.x86_64 nss-pem-1.0.3-5.amzn2.x86_64 -nss-softokn-3.44.0-5.amzn2.0.2.x86_64 -nss-sysinit-3.44.0-4.amzn2.0.2.x86_64 -nss-tools-3.44.0-4.amzn2.0.2.x86_64 +nss-softokn-3.44.0-8.amzn2.x86_64 +nss-sysinit-3.44.0-7.amzn2.x86_64 +nss-tools-3.44.0-7.amzn2.x86_64 openldap-2.4.44-15.amzn2.x86_64 pinentry-0.8.1-17.amzn2.0.2.x86_64 pth-2.0.7-23.amzn2.0.2.x86_64 pygpgme-0.3-9.amzn2.0.2.x86_64 pyliblzma-0.5.3-11.amzn2.0.2.x86_64 -python-2.7.16-3.amzn2.0.1.x86_64 +python-2.7.18-1.amzn2.x86_64 python-iniparse-0.4-9.amzn2.noarch -python-libs-2.7.16-3.amzn2.0.1.x86_64 +python-libs-2.7.18-1.amzn2.x86_64 python-pycurl-7.19.0-19.amzn2.0.2.x86_64 -python-urlgrabber-3.10-8.amzn2.noarch +python-urlgrabber-3.10-9.amzn2.0.1.noarch +python2-rpm-4.11.3-40.amzn2.0.4.x86_64 pyxattr-0.5.1-5.amzn2.0.2.x86_64 readline-6.2-10.amzn2.0.2.x86_64 -rpm-4.11.3-25.amzn2.0.3.x86_64 -rpm-build-libs-4.11.3-25.amzn2.0.3.x86_64 -rpm-libs-4.11.3-25.amzn2.0.3.x86_64 -rpm-python-4.11.3-25.amzn2.0.3.x86_64 +rpm-4.11.3-40.amzn2.0.4.x86_64 +rpm-build-libs-4.11.3-40.amzn2.0.4.x86_64 +rpm-libs-4.11.3-40.amzn2.0.4.x86_64 shared-mime-info-1.8-4.amzn2.x86_64 -sqlite-3.7.17-8.amzn2.0.2.x86_64 +sqlite-3.7.17-8.amzn2.1.1.x86_64 vim-minimal-8.1.1602-1.amzn2.x86_64 xz-libs-5.2.2-1.amzn2.0.2.x86_64 -yum-3.4.3-158.amzn2.0.2.noarch +yum-3.4.3-158.amzn2.0.4.noarch yum-metadata-parser-1.1.4-10.amzn2.0.2.x86_64 yum-plugin-ovl-1.1.31-46.amzn2.0.1.noarch yum-plugin-priorities-1.1.31-46.amzn2.0.1.noarch diff --git a/base/base-2/packages.txt b/base/base-2/packages.txt index 81a1640c..7c3c164e 100644 --- a/base/base-2/packages.txt +++ b/base/base-2/packages.txt @@ -1,8 +1,8 @@ basesystem-10.0-7.amzn2.0.1.noarch -bash-4.2.46-30.amzn2.x86_64 -ca-certificates-2019.2.32-76.amzn2.0.1.noarch +bash-4.2.46-33.amzn2.x86_64 +ca-certificates-2019.2.32-76.amzn2.0.2.noarch chkconfig-1.7.4-1.amzn2.0.2.x86_64 -coreutils-8.22-21.amzn2.x86_64 +coreutils-8.22-24.amzn2.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 glibc-2.26-34.amzn2.x86_64 @@ -13,14 +13,14 @@ gmp-6.0.0-15.amzn2.0.2.x86_64 grep-2.20-3.amzn2.0.2.x86_64 info-5.1-5.amzn2.x86_64 keyutils-libs-1.5.8-3.amzn2.0.2.x86_64 -krb5-libs-1.15.1-37.amzn2.2.1.x86_64 +krb5-libs-1.15.1-37.amzn2.2.2.x86_64 libacl-2.2.51-14.amzn2.x86_64 libattr-2.4.46-12.amzn2.0.2.x86_64 libcap-2.22-9.amzn2.0.2.x86_64 libcom_err-1.42.9-12.amzn2.0.2.x86_64 libffi-3.0.13-18.amzn2.0.2.x86_64 libgcc-7.3.1-6.amzn2.0.4.x86_64 -libicu-50.1.2-17.amzn2.x86_64 +libicu-50.2-4.amzn2.x86_64 libselinux-2.5-12.amzn2.0.2.x86_64 libsepol-2.5-8.1.amzn2.0.2.x86_64 libstdc++-7.3.1-6.amzn2.0.4.x86_64 @@ -32,13 +32,13 @@ ncurses-libs-6.0-8.20170212.amzn2.1.3.x86_64 nspr-4.21.0-1.amzn2.0.2.x86_64 nss-softokn-freebl-3.44.0-8.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 -openssl-libs-1.0.2k-19.amzn2.0.1.x86_64 +openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 p11-kit-0.23.5-3.amzn2.0.2.x86_64 p11-kit-trust-0.23.5-3.amzn2.0.2.x86_64 pcre-8.32-17.amzn2.0.2.x86_64 popt-1.13-16.amzn2.0.2.x86_64 sed-4.2.2-5.amzn2.0.2.x86_64 -setup-2.8.71-10.amzn2.noarch +setup-2.8.71-10.amzn2.0.1.noarch system-release-2-11.amzn2.x86_64 tzdata-2019c-1.amzn2.noarch -zlib-1.2.7-17.amzn2.0.2.x86_64 +zlib-1.2.7-18.amzn2.x86_64 From 1a5ef29741961444212b663868e7ba90a7a0d7c6 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 24 Jun 2020 12:18:25 -0400 Subject: [PATCH 06/83] Update dotnetcore2.1 Bootstrap --- .../run/MockBootstraps/lib/Bootstrap.dll | Bin 147456 -> 147456 bytes .../run/MockBootstraps/lib/Bootstrap.pdb | Bin 44980 -> 44964 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll index 4880d8fd9ec88680c4407c7cbd7228fbbb51f489..1e9e0796febf86a99471027dc5c25741e5b11b97 100644 GIT binary patch delta 114 zcmZo@;B08%oY29tc(3o##-6P`j2G?;h`O(@3!2{U-{hS0tn-JY*Y=zTj3yy0Y7@Nn zPG4fe6d;iH>D;vdZX=h@z0G|)Ua)ML&SJ`xsQ?u{;t3T6s<-X%D}DK{iuFhBlK*+z Jdrg^&xd3}cGyebp delta 114 zcmZo@;B08%oY2AY!~Oin#-6P`j2G?;=mzr67jc>3ye8mUxVhb`t=n@RFq(w0WIes| zdHNC)rT~H4E?u)pyJ6b4=`5y9nF>(R1-wvEkowHTKT6Z4`Do6lJ)66| J*OaN43jn_?G~@sP diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb index 3f913c8b3c16410e70ff8393a9e04193f32497a7..83172b95b8b62266fdb0f0bd914158cf75822fad 100644 GIT binary patch delta 8591 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 delta 8605 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 From fe5454bf980d062e0a87c2fd16d7f57d343c3bbd Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 24 Jun 2020 12:32:05 -0400 Subject: [PATCH 07/83] Update gradle to 6.5.0 in java build images --- base/test-all.sh | 2 +- java11/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/test-all.sh b/base/test-all.sh index 0bded02f..563f2671 100755 --- a/base/test-all.sh +++ b/base/test-all.sh @@ -34,7 +34,7 @@ docker run --rm -v "$PWD":/var/task lambci/lambda:ruby2.5 lambda_function.lambda docker run --rm -v "$PWD":/var/task lambci/lambda:ruby2.7 lambda_function.lambda_handler cd ${EXAMPLES_DIR}/java -docker run --rm -v "$PWD":/app -w /app gradle gradle build +docker run --rm -v "$PWD":/app -w /app lambci/lambda:build-java8 gradle build docker run --rm -v "$PWD/build/docker":/var/task lambci/lambda:java8 org.lambci.lambda.ExampleHandler '{"some": "event"}' docker run --rm -v "$PWD/build/docker":/var/task lambci/lambda:java11 org.lambci.lambda.ExampleHandler '{"some": "event"}' diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index a4953ff8..8262f998 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -6,12 +6,12 @@ ENV PATH=/var/lang/bin:$PATH \ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/java11.tgz | tar -zx -C / && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://downloads.gradle-dn.com/distributions/gradle-6.4.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.4.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.5/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index eb5a62c7..03e72f3c 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -7,12 +7,12 @@ WORKDIR / RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://downloads.gradle-dn.com/distributions/gradle-6.4.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.4.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.5/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir From 20fca7e5121e4b8e40fe68d6a826220d0389d012 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 26 Jun 2020 16:51:03 -0400 Subject: [PATCH 08/83] Add CORS headers to Lambda API --- provided/run/init.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/provided/run/init.go b/provided/run/init.go index d2f33d37..b3b3aa66 100644 --- a/provided/run/init.go +++ b/provided/run/init.go @@ -342,9 +342,20 @@ func waitForContext(context *mockLambdaContext) { } func addAPIRoutes(r *chi.Mux) *chi.Mux { + r.Options("/*", func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("x-amzn-requestid", fakeGUID()) + w.Header().Set("access-control-allow-origin", "*") + w.Header().Set("access-control-expose-headers", "x-amzn-RequestId,x-amzn-ErrorType,x-amzn-ErrorMessage,Date,x-amz-log-result,x-amz-function-error") + w.Header().Set("access-control-max-age", "172800") + w.WriteHeader(200) + }) + r.Post("/2015-03-31/functions/{function}/invocations", func(w http.ResponseWriter, r *http.Request) { context := newContext() + w.Header().Set("access-control-allow-origin", "*") + w.Header().Set("access-control-expose-headers", "x-amzn-RequestId,x-amzn-ErrorType,x-amzn-ErrorMessage,Date,x-amz-log-result,x-amz-function-error") + if r.Header.Get("X-Amz-Invocation-Type") != "" { context.InvocationType = r.Header.Get("X-Amz-Invocation-Type") } From 858a1f742e0d535a0ad2fb71a73260c148860a14 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 26 Jun 2020 17:42:29 -0400 Subject: [PATCH 09/83] Roll back dotnetcore2.1 Bootstrap --- .../run/MockBootstraps/lib/Bootstrap.dll | Bin 147456 -> 147456 bytes .../run/MockBootstraps/lib/Bootstrap.pdb | Bin 44964 -> 44980 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll index 1e9e0796febf86a99471027dc5c25741e5b11b97..4880d8fd9ec88680c4407c7cbd7228fbbb51f489 100644 GIT binary patch delta 114 zcmZo@;B08%oY2AY!~Oin#-6P`j2G?;=mzr67jc>3ye8mUxVhb`t=n@RFq(w0WIes| zdHNC)rT~H4E?u)pyJ6b4=`5y9nF>(R1-wvEkowHTKT6Z4`Do6lJ)66| J*OaN43jn_?G~@sP delta 114 zcmZo@;B08%oY29tc(3o##-6P`j2G?;h`O(@3!2{U-{hS0tn-JY*Y=zTj3yy0Y7@Nn zPG4fe6d;iH>D;vdZX=h@z0G|)Ua)ML&SJ`xsQ?u{;t3T6s<-X%D}DK{iuFhBlK*+z Jdrg^&xd3}cGyebp diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb index 83172b95b8b62266fdb0f0bd914158cf75822fad..3f913c8b3c16410e70ff8393a9e04193f32497a7 100644 GIT binary patch delta 8605 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 delta 8591 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 From a90b26718834d51ac407b7cb7d2493f64641f0a5 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 26 Jun 2020 19:29:28 -0400 Subject: [PATCH 10/83] Fix stay-open test --- base/test-all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/base/test-all.sh b/base/test-all.sh index 563f2671..aa0e1a8c 100755 --- a/base/test-all.sh +++ b/base/test-all.sh @@ -58,5 +58,6 @@ cd ${EXAMPLES_DIR}/provided docker run --rm -v "$PWD":/var/task lambci/lambda:provided handler '{"some": "event"}' # To invoke and keep open: +# cd ${EXAMPLES_DIR}/ruby # docker run --rm -v $PWD:/var/task -e DOCKER_LAMBDA_STAY_OPEN=1 -p 9001:9001 \ # lambci/lambda:ruby2.5 lambda_function.lambda_handler From 4190ed1cfd599c778f5b3388b82f0a996e1860c3 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sat, 27 Jun 2020 13:02:16 -0400 Subject: [PATCH 11/83] Revert "yum-plugin-ovl is now included in Amazon Linux 1 Lambdas" This reverts commit 38f12c4df00ba1ed48d12c0318494a975a5f04d0. --- base/build/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/base/build/Dockerfile b/base/build/Dockerfile index e2a6fa1d..99fa4bc2 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -4,7 +4,16 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin # A couple of packages are either missing critical-ish files, or didn't make it into the tar RUN chmod 1777 /tmp && \ + /usr/bin/python3 -c "from configparser import SafeConfigParser; \ +yum_conf = SafeConfigParser(); \ +yum_conf.read('/etc/yum.conf'); \ +yum_conf.has_section('main') or yum_conf.add_section('main'); \ +yum_conf.set('main', 'plugins', '1'); \ +f = open('/etc/yum.conf', 'w'); \ +yum_conf.write(f); \ +f.close();" && \ rpm --rebuilddb && \ + yum install -y yum-plugin-ovl && \ yum reinstall -y setup pam shadow-utils audit-libs openssl glibc-common glibc && \ yum groupinstall -y development && \ yum install -y clang cmake docker python27-devel python36-devel \ From fd4b833af83b0e3b8693ae10c13f818dfaa54717 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 30 Jun 2020 08:13:38 -0400 Subject: [PATCH 12/83] Update gradle to 6.5.1 in java build images --- java11/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 8262f998..9418442b 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -6,12 +6,12 @@ ENV PATH=/var/lang/bin:$PATH \ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/java11.tgz | tar -zx -C / && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5.1-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.5/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 03e72f3c..708c3f54 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -7,12 +7,12 @@ WORKDIR / RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5.1-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.5/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir From 46ff80e2fe3bbb3fab4fa18ac2fb05d7167f064e Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 30 Jun 2020 14:24:06 -0400 Subject: [PATCH 13/83] Add headers and methods CORS headers to OPTIONS call --- provided/run/init.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/provided/run/init.go b/provided/run/init.go index b3b3aa66..584f2489 100644 --- a/provided/run/init.go +++ b/provided/run/init.go @@ -343,18 +343,30 @@ func waitForContext(context *mockLambdaContext) { func addAPIRoutes(r *chi.Mux) *chi.Mux { r.Options("/*", func(w http.ResponseWriter, r *http.Request) { + if r.Header.Get("Origin") == "" { + w.WriteHeader(403) + return + } w.Header().Set("x-amzn-requestid", fakeGUID()) w.Header().Set("access-control-allow-origin", "*") w.Header().Set("access-control-expose-headers", "x-amzn-RequestId,x-amzn-ErrorType,x-amzn-ErrorMessage,Date,x-amz-log-result,x-amz-function-error") w.Header().Set("access-control-max-age", "172800") + if r.Header.Get("Access-Control-Request-Headers") != "" { + w.Header().Set("access-control-allow-headers", r.Header.Get("Access-Control-Request-Headers")) + } + if r.Header.Get("Access-Control-Request-Method") != "" { + w.Header().Set("access-control-allow-methods", r.Header.Get("Access-Control-Request-Method")) + } w.WriteHeader(200) }) r.Post("/2015-03-31/functions/{function}/invocations", func(w http.ResponseWriter, r *http.Request) { context := newContext() - w.Header().Set("access-control-allow-origin", "*") - w.Header().Set("access-control-expose-headers", "x-amzn-RequestId,x-amzn-ErrorType,x-amzn-ErrorMessage,Date,x-amz-log-result,x-amz-function-error") + if r.Header.Get("Origin") != "" { + w.Header().Set("access-control-allow-origin", "*") + w.Header().Set("access-control-expose-headers", "x-amzn-RequestId,x-amzn-ErrorType,x-amzn-ErrorMessage,Date,x-amz-log-result,x-amz-function-error") + } if r.Header.Get("X-Amz-Invocation-Type") != "" { context.InvocationType = r.Header.Get("X-Amz-Invocation-Type") From 187542add179d199825090c10d6bbb387d76fea1 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 1 Jul 2020 14:25:29 -0400 Subject: [PATCH 14/83] Nicer error output for java8 --- .../java/lambdainternal/LambdaRuntime.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java b/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java index d2b9df1a..4737a67d 100644 --- a/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java +++ b/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java @@ -11,6 +11,7 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; import java.util.Date; @@ -20,6 +21,7 @@ import java.util.UUID; import com.google.gson.Gson; +import com.google.gson.JsonObject; import sun.misc.Unsafe; import sun.misc.Signal; @@ -42,6 +44,7 @@ public class LambdaRuntime { private static long deadlineMs; private static boolean invoked = false; private static boolean errored = false; + private static String errorMsg = ""; private static boolean initEndSent = false; private static long initEnd; private static long receivedInvokeAt; @@ -216,6 +219,13 @@ public static void reportDone(final String invokeid, final byte[] result, final byte[] resultCopy = result == null ? new byte[0] : new String(result, 0, resultLength).getBytes(StandardCharsets.UTF_8); + + if (errored && resultCopy.length == 0) { + JsonObject errObject = new JsonObject(); + errObject.addProperty("errorMessage", !isNullOrEmpty(errorMsg) ? errorMsg : "Unknown error"); + resultCopy = errObject.toString().getBytes(StandardCharsets.UTF_8); + } + try (OutputStream os = conn.getOutputStream()) { os.write(resultCopy); } @@ -231,7 +241,20 @@ public static void reportDone(final String invokeid, final byte[] result, final public static void reportFault(final String invokeid, final String msg, final String exceptionClass, final String stack) { errored = true; - systemErr(stack); + ArrayList errorPieces = new ArrayList(); + if (exceptionClass != null) { + systemErr(exceptionClass); + errorPieces.add(exceptionClass); + } + if (msg != null) { + systemErr(msg); + errorPieces.add(msg); + } + if (stack != null) { + systemErr(stack); + errorPieces.add(stack); + } + errorMsg = String.join("\n", errorPieces); } public static int getRemainingTime() { From ed7e7e9d7b7b7dc7563f215db8aadb079e04aa9d Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Mon, 20 Jul 2020 17:04:07 -0400 Subject: [PATCH 15/83] Use pipx for all global python binaries (#297) * Use pipx for all global python binaries - Add /root/.local/bin to PATH - Add pipx to base build images - Update aws-lambda-builders to 1.0.0 - Update dotnetcore3.1 build SDK to 3.1.302 * Also publish tag with date --- base/build-2/Dockerfile | 3 ++- base/build/Dockerfile | 7 ++++--- base/publish-all.sh | 6 ++++++ dotnetcore2.0/build/Dockerfile | 8 +++++++- dotnetcore2.1/build/Dockerfile | 8 +++++++- dotnetcore3.1/build/Dockerfile | 6 ++++-- go1.x/build/Dockerfile | 6 +++++- java11/build/Dockerfile | 4 +++- java8/build/Dockerfile | 6 +++++- nodejs10.x/build/Dockerfile | 4 +++- nodejs12.x/build/Dockerfile | 4 +++- nodejs4.3/build/Dockerfile | 6 +++++- nodejs6.10/build/Dockerfile | 6 +++++- nodejs8.10/build/Dockerfile | 6 +++++- provided/build/Dockerfile | 6 +++++- python3.6/build/Dockerfile | 11 ++++++++--- python3.7/build/Dockerfile | 11 ++++++++--- python3.8/build/Dockerfile | 11 ++++++++--- ruby2.5/build/Dockerfile | 10 +++++++--- ruby2.7/build/Dockerfile | 8 +++++--- 20 files changed, 105 insertions(+), 32 deletions(-) diff --git a/base/build-2/Dockerfile b/base/build-2/Dockerfile index a0d07fbd..1c807711 100644 --- a/base/build-2/Dockerfile +++ b/base/build-2/Dockerfile @@ -6,7 +6,7 @@ RUN yum list yum && \ FROM lambci/lambda-base-2 -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin +ENV PATH=/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin COPY --from=0 /installroot/etc /etc/ COPY --from=0 /installroot/usr /usr/ @@ -17,5 +17,6 @@ RUN yum reinstall -y filesystem setup glibc-common glibc; \ yum install -y which clang cmake python-devel python3-devel amazon-linux-extras && \ amazon-linux-extras install -y docker && \ pip3 install -U pip setuptools wheel --no-cache-dir && \ + pip3 install --user pipx --no-cache-dir && \ yum clean all && \ rm -rf /var/cache/yum diff --git a/base/build/Dockerfile b/base/build/Dockerfile index 99fa4bc2..6e22c0df 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -1,6 +1,6 @@ FROM lambci/lambda-base -ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin +ENV PATH=/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin # A couple of packages are either missing critical-ish files, or didn't make it into the tar RUN chmod 1777 /tmp && \ @@ -22,7 +22,8 @@ f.close();" && \ alternatives --set gcc /usr/bin/gcc48 && \ alternatives --set g++ /usr/bin/g++48 && \ alternatives --set cpp /usr/bin/cpp48 && \ - curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python3 && \ - pip install -U setuptools wheel --no-cache-dir && \ + python3 -m pip install -U pip setuptools wheel --no-cache-dir && \ + pip install --user pipx --no-cache-dir && \ + pipx run awscli==1.* 2>/dev/null || true && \ yum clean all && \ rm -rf /var/cache/yum diff --git a/base/publish-all.sh b/base/publish-all.sh index b5f5027c..53bfce6b 100755 --- a/base/publish-all.sh +++ b/base/publish-all.sh @@ -9,12 +9,16 @@ echo export DOCKER_CONTENT_TRUST=1 export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE +export PUBLISH_DATE=$(date "+%Y%m%d") + docker push lambci/lambda-base docker push lambci/lambda-base-2 for RUNTIME in $RUNTIMES; do echo $RUNTIME + docker tag lambci/lambda:${RUNTIME} lambci/lambda:${PUBLISH_DATE}-${RUNTIME} docker push lambci/lambda:${RUNTIME} + docker push lambci/lambda:${PUBLISH_DATE}-${RUNTIME} done docker push lambci/lambda-base:build @@ -22,5 +26,7 @@ docker push lambci/lambda-base-2:build for RUNTIME in $RUNTIMES; do echo build-${RUNTIME} + docker tag lambci/lambda:build-${RUNTIME} lambci/lambda:${PUBLISH_DATE}-build-${RUNTIME} docker push lambci/lambda:build-${RUNTIME} + docker push lambci/lambda:${PUBLISH_DATE}-build-${RUNTIME} done diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 4e4b138d..9defe440 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -20,6 +20,12 @@ RUN rm -rf /var/runtime /var/lang && \ rm -rf /tmp/warmup /tmp/NuGetScratch # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 virtualenv pipenv --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install virtualenv && \ + pipx install pipenv && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index be936a46..15f91876 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -21,7 +21,13 @@ RUN rm -rf /var/runtime /var/lang && \ rm -rf /tmp/warmup /tmp/NuGetScratch /tmp/.dotnet # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 virtualenv pipenv --no-cache-dir && \ +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install virtualenv && \ + pipx install pipenv && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index e2cfdcf9..95c1bf17 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -6,7 +6,7 @@ ENV DOTNET_ROOT=/var/lang/bin ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_dotnetcore3.1 \ - DOTNET_SDK_VERSION=3.1.301 \ + DOTNET_SDK_VERSION=3.1.302 \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip @@ -20,7 +20,9 @@ RUN rm -rf /var/runtime /var/lang && \ rm -rf /tmp/warmup /tmp/NuGetScratch /tmp/.dotnet # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir && \ +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 258b3216..a0f6e31b 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -16,6 +16,10 @@ RUN rm -rf /var/runtime /var/lang && \ go get golang.org/x/vgo # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 9418442b..7cb2d76e 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -14,4 +14,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 708c3f54..8b65a22d 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -15,4 +15,8 @@ RUN rm -rf /var/runtime /var/lang && \ ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 4f41af70..1ec80353 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -9,4 +9,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/nodejs10.x.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 51dfeb4e..07df5cd9 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -9,4 +9,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/nodejs12.x.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index c6420f90..46fa9698 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -10,6 +10,10 @@ RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/nodejs4.3.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index c9eb1b24..d5cf1744 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -10,6 +10,10 @@ RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/nodejs6.10.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index b6b4a8bc..5be7cd38 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -10,6 +10,10 @@ RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/nodejs8.10.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 CMD ["npm", "rebuild"] diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index ec3bf89d..97cca041 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -1,4 +1,8 @@ FROM lambci/lambda-base:build # Add these as a separate layer as they get updated frequently -RUN pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index d458b5ee..f6f94d72 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -18,8 +18,13 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ - pip install -U virtualenv pipenv --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.9/get-poetry.py | POETRY_VERSION=1.0.9 python3 && \ - pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir + rm -rf /root/.local && \ + pip install --user pipx --no-cache-dir && \ + pipx install virtualenv && \ + pipx install pipenv && \ + pipx install poetry==1.0.9 && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index dcada8e1..aa5b0b7f 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -10,8 +10,13 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ - pip install -U virtualenv pipenv --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.9/get-poetry.py | POETRY_VERSION=1.0.9 python3 && \ - pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir + rm -rf /root/.local && \ + pip install --user pipx --no-cache-dir && \ + pipx install virtualenv && \ + pipx install pipenv && \ + pipx install poetry==1.0.9 && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index dcf83d6b..5b47e407 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -10,8 +10,13 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ - pip install -U virtualenv pipenv --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.9/get-poetry.py | POETRY_VERSION=1.0.9 python3 && \ - pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir + rm -rf /root/.local && \ + pip install --user pipx --no-cache-dir && \ + pipx install virtualenv && \ + pipx install pipenv && \ + pipx install poetry==1.0.9 && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 ENV PATH=/root/.poetry/bin:$PATH diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index f6d5cbd0..bc06ecc0 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -12,6 +12,10 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/ruby2.5.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN gem update --system --no-document && \ - gem install --no-document bundler -v '~> 2.1' && \ - pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +# The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 +RUN source ~/.local/pipx/shared/bin/activate && \ + pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 && \ + gem update --system --no-document && \ + gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 3728daf2..c31ecf1a 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -12,6 +12,8 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/ruby2.7.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently -RUN gem update --system --no-document && \ - gem install --no-document bundler -v '~> 2.1' && \ - pip install -U aws-lambda-builders==0.9.0 aws-sam-cli==0.53.0 awscli boto3 --no-cache-dir +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==0.53.0 && \ + gem update --system --no-document && \ + gem install --no-document bundler -v '~> 2.1' From 5133701db94bf2ee28e4134bb742df51a5819c4f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 21 Jul 2020 09:22:49 -0400 Subject: [PATCH 16/83] Use /usr/local for pipx Fixes #298 --- base/build-2/Dockerfile | 6 ++++-- base/build/Dockerfile | 6 ++++-- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 9 ++++----- python3.7/build/Dockerfile | 9 ++++----- python3.8/build/Dockerfile | 9 ++++----- ruby2.5/build/Dockerfile | 2 +- 14 files changed, 29 insertions(+), 28 deletions(-) diff --git a/base/build-2/Dockerfile b/base/build-2/Dockerfile index 1c807711..e41381b5 100644 --- a/base/build-2/Dockerfile +++ b/base/build-2/Dockerfile @@ -6,7 +6,9 @@ RUN yum list yum && \ FROM lambci/lambda-base-2 -ENV PATH=/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin \ + PIPX_BIN_DIR=/usr/local/bin \ + PIPX_HOME=/usr/local/pipx COPY --from=0 /installroot/etc /etc/ COPY --from=0 /installroot/usr /usr/ @@ -17,6 +19,6 @@ RUN yum reinstall -y filesystem setup glibc-common glibc; \ yum install -y which clang cmake python-devel python3-devel amazon-linux-extras && \ amazon-linux-extras install -y docker && \ pip3 install -U pip setuptools wheel --no-cache-dir && \ - pip3 install --user pipx --no-cache-dir && \ + pip3 install pipx --no-cache-dir && \ yum clean all && \ rm -rf /var/cache/yum diff --git a/base/build/Dockerfile b/base/build/Dockerfile index 6e22c0df..2d8fbc8b 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -1,6 +1,8 @@ FROM lambci/lambda-base -ENV PATH=/root/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin +ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin \ + PIPX_BIN_DIR=/usr/local/bin \ + PIPX_HOME=/usr/local/pipx # A couple of packages are either missing critical-ish files, or didn't make it into the tar RUN chmod 1777 /tmp && \ @@ -23,7 +25,7 @@ f.close();" && \ alternatives --set g++ /usr/bin/g++48 && \ alternatives --set cpp /usr/bin/cpp48 && \ python3 -m pip install -U pip setuptools wheel --no-cache-dir && \ - pip install --user pipx --no-cache-dir && \ + pip install pipx --no-cache-dir && \ pipx run awscli==1.* 2>/dev/null || true && \ yum clean all && \ rm -rf /var/cache/yum diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 9defe440..c47040a1 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -21,7 +21,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install awscli==1.* && \ diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 15f91876..b0da831b 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -22,7 +22,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install awscli==1.* && \ diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index a0f6e31b..7e0d730b 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -17,7 +17,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 8b65a22d..ed8631cd 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -16,7 +16,7 @@ ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 46fa9698..4688f91f 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -11,7 +11,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index d5cf1744..ce7b8616 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -11,7 +11,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 5be7cd38..93c0e8c2 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -11,7 +11,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 97cca041..5b885549 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -2,7 +2,7 @@ FROM lambci/lambda-base:build # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index f6f94d72..19de2812 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -3,7 +3,9 @@ FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_python3.6 \ - PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig + PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig \ + PIPX_BIN_DIR=/var/lang/bin \ + PIPX_HOME=/var/lang/pipx RUN rm -rf /var/runtime /var/lang && \ export PYTHON_VERSION=3.6.10 && \ @@ -18,13 +20,10 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ - rm -rf /root/.local && \ - pip install --user pipx --no-cache-dir && \ + pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install poetry==1.0.9 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 - -ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index aa5b0b7f..cbb8a404 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -3,20 +3,19 @@ FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_python3.7 \ - PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig + PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig \ + PIPX_BIN_DIR=/var/lang/bin \ + PIPX_HOME=/var/lang/pipx RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/python3.7.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ - rm -rf /root/.local && \ - pip install --user pipx --no-cache-dir && \ + pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install poetry==1.0.9 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 - -ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 5b47e407..83e7a77c 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -3,20 +3,19 @@ FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_python3.8 \ - PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig + PKG_CONFIG_PATH=/var/lang/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig \ + PIPX_BIN_DIR=/var/lang/bin \ + PIPX_HOME=/var/lang/pipx RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/python3.8.tgz | tar -zx -C / # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ - rm -rf /root/.local && \ - pip install --user pipx --no-cache-dir && \ + pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install poetry==1.0.9 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 - -ENV PATH=/root/.poetry/bin:$PATH diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index bc06ecc0..ae3c93dc 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -13,7 +13,7 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 -RUN source ~/.local/pipx/shared/bin/activate && \ +RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==0.53.0 && \ From f6dd2b4ac594fe51517700ec68b73f759d73cdaf Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 21 Jul 2020 17:27:35 -0400 Subject: [PATCH 17/83] Update aws-sam-cli to 1.0.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- .../run/MockBootstraps/lib/Bootstrap.dll | Bin 147456 -> 147456 bytes .../run/MockBootstraps/lib/Bootstrap.pdb | Bin 44980 -> 44964 bytes dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index c47040a1..34c89f9c 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -26,6 +26,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index b0da831b..7f52d4b8 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -27,7 +27,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 && \ + pipx install aws-sam-cli==1.0.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll index 4880d8fd9ec88680c4407c7cbd7228fbbb51f489..1e9e0796febf86a99471027dc5c25741e5b11b97 100644 GIT binary patch delta 114 zcmZo@;B08%oY29tc(3o##-6P`j2G?;h`O(@3!2{U-{hS0tn-JY*Y=zTj3yy0Y7@Nn zPG4fe6d;iH>D;vdZX=h@z0G|)Ua)ML&SJ`xsQ?u{;t3T6s<-X%D}DK{iuFhBlK*+z Jdrg^&xd3}cGyebp delta 114 zcmZo@;B08%oY2AY!~Oin#-6P`j2G?;=mzr67jc>3ye8mUxVhb`t=n@RFq(w0WIes| zdHNC)rT~H4E?u)pyJ6b4=`5y9nF>(R1-wvEkowHTKT6Z4`Do6lJ)66| J*OaN43jn_?G~@sP diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb index 3f913c8b3c16410e70ff8393a9e04193f32497a7..83172b95b8b62266fdb0f0bd914158cf75822fad 100644 GIT binary patch delta 8591 zcmZu%30PCd_MZt663B&wY>JVOcup%>zq+#OZ?zF&a}S zK*xbE0?#eNsI^FdZUg@Ue7zW>?}`QJA0-%_EfJvSN->&LDj@EF>0PmYH^k0~L#?O| za0>8Gz(v4SKxnKLeF}UFa2N1sD0BnGqlUtG+~320+c0@?=H1L!J3K_IjvuGo$g#pFfK>TH3>rNxOzSdxf>0HJ_z zfDzCgkO9aAwvES_W_Rpj{)6=`ymdX98MedLwX-u89(U^ zYlp)R2vI0epRG>IO5+EIr190|- zpCN$ZfHFW8U=m;kpb^jvXaTeVmIKy4HK;_JM=H?{z&^l1CRd_2pVn*8J0msd9N-Gz z6DHT7TZ|)+5Oy5=i(s&nMj$&N4Uoes0#JTwchua~CH*Qp?uVgmptc0i4(I@2&nj11X~biEnr`|&h@QN$2NhGL#ZFybm?)QYv5k$DoMn3;?$b7cuw zh>)V0Of9qHHnOhFUb0>u0Qxf5X2w$2R>qubC*xq(9-n-_kKbTyavhh^_l&N$e0)x( z^+QPIxD=PrUm zm{24_Y60vyEO1bpHmxEYA#X12JJ<-;=tH{y{RoFzRRQf8PzN2?f zCnqY@cozAnVh!F#W{goe_jA+@TK7R8ANBD`AHT!Npgz)lo(se^0#OhO_jgc<$$ga* z^O7)L65+l9l1d@y#EO`X!Trq>NgOZ9cK^tQ;%chHOM0Lj4|*ap@Jc36&@-kb(3sVu z<~TY;qX>=|kAY;4HOAVwAnNoW>TfngIuNTTg>^jDlffm6p_`sw#633IS;&T=_msjg zD(Ns3e5ZAuanROSDv|S&aL*)=lu=0(FVT2rK9QK8Nap`dqV;&6NPKp5o+TjhSvIh# z4D+nyL`Y7%`=rlwhSi?+q-2~5ze1ewyNmvY9e`1o|E{R=90o;&Q|+O%6Z&j59lOl) zE=Rp3^_+uh@D>%yJy+P!)t-NYzn(NpYb>4{%vI5zTTH|3xdTpqqCw|a?|A?QpOqLq zKXMZNQxR=V;d#sj;C@1641~q%?MB8_8gVFDP^r@EIWaN{L=vPEI>g8XPq;zou)<3^ zZyY&LX~mi3)5_?G0h}M06bWECJ48q&fHkcVI$XEmtd)9)6GPQ)`D$>SLj zX75rtSVTE3HVQcK7U5FG%zQJx6CCUkB_gu znDOvV_S*Vy>Pm0N?|)S+oAO$!gyskVswld%hr%V)^PgrrSejg!d5iR19#F8icrj31Fblh5FO zq+v>KH#cX*rR3BUJ-ITaA^a0qDZS`Qi4{76sjJ-|sv#nJzUmq~^+SxCNXm4Rb0H}4 zvw&;7ZJZ<=q3+&gu=wiedPxi7qvktz;C$qmRK$%P`at1bgCB)96C@JTXm#?SayGOFGh z6%6VD0uiR`BLFFA%n0`F1=p84SRC%~uC4VPcG|Y}uAb#REw>z9lGc6N`MYoKSbmpv zELTofNlG7?l7?Hh5tzJy^-Ve8uf-C~AL!CzRwLt=k(n;R#L>LJsGAiPu%+VZ5s)N+ zWJ@H3{$l}2YVc2}1@FVy44@TFHy#Yj55?2ft)#v8sXEG`UO$hFZ>YdK$f<@@e26@1 zNS2?0q3Q%8Iar$+3pr7O>paPt6&rjN<{0Km3roc2`VXm}rNdv6_F3Da4bQwl}cGRG|$%J{=_v$N%qb5$3^7eY%3l|J_G4w^80M9eik&s z31BD*LKqZ;8yJaz*)X`9N$Q+vyqJ{1?;5b7#aqaF_}xbi&q;;ZxT~?cJX6n*Vp$>e)(PZAzS~`x1##gWa@ZTCUdVki#a}tilTCu$ehbWgV^-s z@#$0nBL%MFmRF9TTiYu55pbAvS46;&BWX!k*((3uXEnEKX@2hwq@|W zb<#+LN~D|_WedP}Z2l3d=EQWz$jTsIv1837bkHg3H%e?JHy7y1JdqnxNA*Az*CU(3h03-Ko-b;;e>?~TO&ZjEpRO!O>V3xB$b|S;PDBb za?PP{&piCHwB_E*wxk1}ei(b_XU(I5vtq!Ug?!?fg~yO0?>y@^E*Nn_qzy)>zw31_ zgr=a|w+q1!9O7 z5}NU{d?nZysWRda%9N6tmW&W{1RG?umXU?*Zm}iqbH6l5)$7>|kz5K0@nMqX~op!x} zOno8U(s^;`S{JdL+jnMV<2Td4G8~_nHH$_A zm8IT&@7RW&jpG*xd4uc}7iuF}DU#?G#^X3LVBzzc5aF0v8BxvqAKqQIe8<)eGuP!U zeU*A4JCxj5sIlp3z9C@wKz<}=dh%?G;pNm^Tr#AC2+b4|^P=7w&6kq{E=Rr7E@}?X z4QlxM{Vl_LzG9DubiqItEK0=PyY?-TVNA%W7gO;b;%>M3QyaM)iD^wApSLkS@W8{R z8TBcj{v0dl%J@V-@DR0aQiaeHZvgFBuTVIu3IZWMvMbAz3l1AtL;}@NnjkiDLfD7U zbGilLvV?^*X%%NDr&~4ZOgJ5+bVLApc%G-D$onSU&3d_qn+P^=kWx`BMgLX*fVtBTYRhB}L{@GDIa)(wkXSHbtj0 zp@j*JF>L4QViTz_A+9$iot2g1;@OTh+IW=&Ce+y(X%k^r!luzACD1oC-FZr8GEsHIo{1CF$i21>&F|ku_`*ck?h6;zMYc_zO|BJ9gTP_d9ULb z-c4S3sUI}?{!4=)Yg8>A?pz-G!EgBZifIcf&a^IGIHPP_uT`JWHiSXZJh2vq93RX$ zK469Lu`nb)Xkgvs+5M_!SJ}tU;u6u6x_Pc;u9b%(4z(%lsT~bPme4yl{!vxcF#AEi zLa^vx%wmX%k%DcqaY985D~9uXE}SnJ_>E}j&g#tk8)gePu&!~&)Y|{A!T%||i$==d z+;#ZDnX>;bKVQ);@aE6cze!}_zh+r9mXgKG4EkucPK42H4GFFMFs$*$Oh~d*$-B#p zIEQ?_ESf8#_XL5XM^A`zWh8ug4?KeuEjMBZsb6l9wdT<4oY2*p*CPvFbhVQm%iq_; z{ha#l`@K?=Zhk?&klUrTnIB$Dqnjy1N!o}eDVBXv5!%?{Ah9uj%9EK;lEFg5h+Ytk zq1C2r$b<68Rr0*C9g>^`L9iZ87B+Ec7`=SMX#l&_lmlVbwVKRaVS<#5tQdrk!&xv2 zUnglR6Q{Tnvo9#azMJ}8eg52;4@b921`KTFoz9LQiGn|Vlm#MB?Z{Dl*a~Y-3o8yzDP)H9V5J#HlOI=BSz2!krbvQZS;q6PH*YPv zpM7}al^ZlFCCd18kXlbrk)~CG8p4jw*!FA*;>q9Ktxsup) ze&Qyq?#U(F;Sz!hp*g?&EV6HPEG{P3R)Id#{c&9;eoXA0RxBfG$X_7flzeEJ;hJxgSpOya5t+DwUOG3mJ}RVNOp zU-i|Z$BA>RzuKO3{V~41YKNXVBP2x!%U4HsYzh&Dac1}gX)u!$o6ITI=bf(m^~Qg?wa)HepR=F6C*}8$l;1-#e)GsI0ltZ&p<!GpdHZr^SR%L3I|4$IhK3}Y?+BqQLSca*8p{?lQrO_Ry8zMlxn#(9k~x7$2HRjJ zy_5uJknJz`O;cVz=ooTcBHOk8zYAX_C2idY2dw2?WS}Go;WI8N-y^AoZaZ@*iP$pG z*>(PQ+NF7SX4MY)_2$_HJMX=^UB+i{DZFxug|@8j0sTxBillV^u`Xsqw+8yU*cYCM z`kn_oBQJz!_=^hb`Uu)}U(adt!DS%O3(4&*xuyBn9i#6BBsb2rT$y|}V$$m+TfVr& zx*x~)A&&JyAOH70By;}Vgg*Pd{%${ye7;3VmcDXV+hVG$i~Gsl9(b%j*X{0@t&N)w zzUJzB4n9YOl9gM#@N;C~wwgS1+5>4#$>gL*pD%VS{WWpJqf-Y;w%FPE)hEDTt-Hd@3$3<{-F7-ko|t`{SD*JUpP=QadfWSo5lts=5t|j z0xJda@jQrMD;!_P@pU15DTFV{_>zn)-JVhO+Rt^GRRe;`25p`GzXdN{{Zl;V_%&uv z&fAmo_LTfPO5TE+r*K{vp5TX%{L!lnp;SGI-cgmCqBwKm_||tH-97)?nHT&g9hfln zr$zhE@V(^sNDzO{aQv~ru^=f7@ew(*Bf0;2#f3qOUVQof1Y1t$)k`MHareT^ys^wi zD6bdF$5aJxL&XbKx!vg2_`?p_LXw7L@3cccIdx~j;2OpM+P+Cx-En=*Y?*!8-R427 z4h#A%WA?=SViw1-QXoI5z=Y5~)2rsssIw2LnqFN~WzU<@P#b_xp`xSY@lLbzs=^q4 zsmGN&p_RWY1*;ouKXqmgSJ&$H2#*WOC}&=bY~- z_F6mM9rVel$CpJvOpNQ;v3dTw>P|YY{$|$XfN0iMzJ-+vViKfqudGavML^yOml8Rj z9!96KJ}7%IEpr;1En_~B) ze1>th=Nw~;=Q3lpcZrVLQF~YTc%6<8QtN$78A`oGD~;X@O6opy4d;(SeeUyjf+TdR zn$EnjUZxxeD`XDXgu5;LNtDjCjlZ#L7O<8yuFYy{EY`*MIM214$!)IvjFVgk8E3nW zGS<3ID_PH6?}6tK3UpnjA7+Ges8H*=re@6|T?Oi;=F|KEB5|!u364 zgXg^tvi@;xLeLR(j6v?s)E0QyY(_L5(@$aG+#>=kQsYb zkR~nM8|$QhokA$zox<4W&R{QE-Mtta-F+D+xC>Z)ta}LKM0W|}QSMU4T6a0~rl^9& zMg16dlBmYAQeZAS7NdF_sl&_E(;0uh$Z&uRwWv_?k@hbg52rD7D zKdTJRFQKZEf?`GkcpAtkq%Zqu&_7Q{>$pZO?W@>zj9ov>bD4DLZ00GE>trOY)w@oa zD63qjBaQGsBH~;(;o54Xm(LWDllBWQ%ND!w|nH1dDg{K<~(f{ s%4XN+Wd3U!Q=vj@Q&0XfD|Gi8%fmnXUblVbJ^4d_s^L0VOFv@%9{?Qc>Hq)$ delta 8605 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 diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 95c1bf17..3a5613a4 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -22,7 +22,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 && \ + pipx install aws-sam-cli==1.0.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 7e0d730b..d2bcafb2 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -20,6 +20,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 7cb2d76e..72e3053f 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -16,4 +16,4 @@ ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index ed8631cd..a63cc78e 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -19,4 +19,4 @@ ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 1ec80353..8e3603e5 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 07df5cd9..f9389348 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 4688f91f..38c8bd39 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index ce7b8616..43562b51 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 93c0e8c2..551d0df0 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 CMD ["npm", "rebuild"] diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 5b885549..6c83f670 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -5,4 +5,4 @@ FROM lambci/lambda-base:build RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 19de2812..30bc24fa 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -26,4 +26,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.9 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index cbb8a404..4986c137 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.9 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 83e7a77c..b6fcd43b 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.9 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 + pipx install aws-sam-cli==1.0.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index ae3c93dc..6acd3477 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -16,6 +16,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 && \ + pipx install aws-sam-cli==1.0.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index c31ecf1a..4c3d059e 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==0.53.0 && \ + pipx install aws-sam-cli==1.0.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From f263e1664c4f82883849bbefddfd84644003374f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 21 Jul 2020 17:27:54 -0400 Subject: [PATCH 18/83] Remove yum-plugin-ovl from base build, it's now installed on the OS --- base/build/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/base/build/Dockerfile b/base/build/Dockerfile index 2d8fbc8b..4bafa8f4 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -15,7 +15,6 @@ f = open('/etc/yum.conf', 'w'); \ yum_conf.write(f); \ f.close();" && \ rpm --rebuilddb && \ - yum install -y yum-plugin-ovl && \ yum reinstall -y setup pam shadow-utils audit-libs openssl glibc-common glibc && \ yum groupinstall -y development && \ yum install -y clang cmake docker python27-devel python36-devel \ From 8207111ffc8d5cde604fd8df761c6fb7b65e4e2f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 21 Jul 2020 17:49:37 -0400 Subject: [PATCH 19/83] Update poetry to 1.0.10 in python build images --- python2.7/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index dc20f283..ed8e9abe 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -8,7 +8,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.9/get-poetry.py | POETRY_VERSION=1.0.9 python && \ + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.10/get-poetry.py | POETRY_VERSION=1.0.10 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 30bc24fa..197e3afe 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -23,7 +23,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.0.9 && \ + pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==1.0.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 4986c137..e0275280 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -15,7 +15,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.0.9 && \ + pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==1.0.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index b6fcd43b..70f9ec9d 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -15,7 +15,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.0.9 && \ + pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ pipx install aws-sam-cli==1.0.0 From 72a47daca351fd2d58f08ea5a4642812a0dac4af Mon Sep 17 00:00:00 2001 From: jakub-bochenski Date: Mon, 3 Aug 2020 14:11:46 +0200 Subject: [PATCH 20/83] docs: update broken link (#302) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 484d3257..ce2b5d1a 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ docker run --rm -v "$PWD":/var/task:ro,delegated lambci/lambda:go1.x my_handler # Test a function from the current directory on Java 11 # The directory must be laid out in the same way the Lambda zip file is, # with top-level package source directories and a `lib` directory for third-party jars -# http://docs.aws.amazon.com/lambda/latest/dg/create-deployment-pkg-zip-java.html +# https://docs.aws.amazon.com/lambda/latest/dg/java-package.html docker run --rm -v "$PWD":/var/task:ro,delegated lambci/lambda:java11 org.myorg.MyHandler # Test on .NET Core 3.1 given a test.dll assembly in the current directory, From 7c40c85468107fa2d82bd15f728b537d6bdab23f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 31 Jul 2020 17:05:03 -0400 Subject: [PATCH 21/83] Rework base images to make them less hobbled - Reinstall all yum packages that require reinstalling - Fix filesystem breakages - Remove plugin enabling, should be always enabled now --- base/Dockerfile | 18 +++++++++++++----- base/base-2/Dockerfile | 18 +++++++++++------- base/build-2/Dockerfile | 17 +++++++++-------- base/build/Dockerfile | 20 +++++--------------- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index ab3ea957..6d447adc 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,9 +1,16 @@ -FROM scratch +FROM amazonlinux:1 # Docker doesn't support unpacking from remote URLs with ADD, # and we don't want to 'docker import' because we can't squash into a small layer # So this is expected to be downloaded from https://lambci.s3.amazonaws.com/fs/base.tgz -ADD ./base.tgz / +ADD ./base.tgz /opt/ + +RUN yum --installroot=/opt reinstall -y filesystem-2.4.30-3.8.amzn1 && \ + yum --installroot=/opt clean all + +FROM scratch + +COPY --from=0 /opt / ENV PATH=/usr/local/bin:/usr/bin/:/bin:/opt/bin \ LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib:/opt/lib \ @@ -23,10 +30,11 @@ ENV PATH=/usr/local/bin:/usr/bin/:/bin:/opt/bin \ AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \ _X_AMZN_TRACE_ID='Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=1' -RUN yum reinstall -y filesystem; \ +# pam has problems reinstalling from a non-standard installroot, +# so reinstall everything except filesystem here +RUN yum reinstall -y setup-2.8.14-20.12.amzn1 audit-libs-2.6.5-3.28.amzn1 shadow-utils-4.1.4.2-13.10.amzn1 \ + openssl-1.0.2k-16.151.amzn1 glibc-2.17-292.180.amzn1 glibc-common-2.17-292.180.amzn1 pam-1.1.8-12.33.amzn1 && \ yum clean all && \ - rm -rf /var/cache/yum && \ - mkdir /tmp && \ chown sbx_user1051:495 /tmp && \ chmod 700 /tmp diff --git a/base/base-2/Dockerfile b/base/base-2/Dockerfile index 12b79b22..4e522317 100644 --- a/base/base-2/Dockerfile +++ b/base/base-2/Dockerfile @@ -1,9 +1,17 @@ -FROM scratch +FROM amazonlinux:2 # Docker doesn't support unpacking from remote URLs with ADD, # and we don't want to 'docker import' because we can't squash into a small layer # So this is expected to be downloaded from https://lambci.s3.amazonaws.com/fs/base-2.tgz -ADD ./base-2.tgz / +ADD ./base-2.tgz /opt/ + +RUN yum --installroot=/opt reinstall -y filesystem-3.2-25.amzn2.0.4 \ + setup-2.8.71-10.amzn2.0.1 glibc-2.26-34.amzn2 glibc-common-2.26-34.amzn2 && \ + yum --installroot=/opt clean all + +FROM scratch + +COPY --from=0 /opt / ENV PATH=/usr/local/bin:/usr/bin/:/bin:/opt/bin \ LD_LIBRARY_PATH=/lib64:/usr/lib64:/var/runtime:/var/runtime/lib:/var/task:/var/task/lib:/opt/lib \ @@ -23,11 +31,7 @@ ENV PATH=/usr/local/bin:/usr/bin/:/bin:/opt/bin \ AWS_XRAY_CONTEXT_MISSING=LOG_ERROR \ _X_AMZN_TRACE_ID='Root=1-dc99d00f-c079a84d433534434534ef0d;Parent=91ed514f1e5c03b2;Sampled=1' -RUN rm -rf /var/cache/yum /var/lib/rpm/__db.* && \ - > /var/log/yum.log && \ - mkdir -p /root /tmp && \ - chmod 550 /root && \ - chown sbx_user1051:495 /tmp && \ +RUN chown sbx_user1051:495 /tmp && \ chmod 700 /tmp WORKDIR /var/task diff --git a/base/build-2/Dockerfile b/base/build-2/Dockerfile index e41381b5..104c9db7 100644 --- a/base/build-2/Dockerfile +++ b/base/build-2/Dockerfile @@ -1,8 +1,10 @@ +FROM lambci/lambda-base-2 + FROM amazonlinux:2 -RUN yum list yum && \ - yum install -y --releasever=2 --installroot=/installroot yum yum-plugin-ovl yum-plugin-priorities +COPY --from=0 / /opt/ +RUN yum --installroot=/opt install -y yum yum-plugin-ovl yum-plugin-priorities FROM lambci/lambda-base-2 @@ -10,15 +12,14 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin \ PIPX_BIN_DIR=/usr/local/bin \ PIPX_HOME=/usr/local/pipx -COPY --from=0 /installroot/etc /etc/ -COPY --from=0 /installroot/usr /usr/ +COPY --from=1 /opt / -RUN yum reinstall -y filesystem setup glibc-common glibc; \ +RUN chown root:root /tmp && \ + chmod 1777 /tmp && \ yum install -y glibc-langpack-en && \ yum groupinstall -y development && \ yum install -y which clang cmake python-devel python3-devel amazon-linux-extras && \ amazon-linux-extras install -y docker && \ - pip3 install -U pip setuptools wheel --no-cache-dir && \ - pip3 install pipx --no-cache-dir && \ yum clean all && \ - rm -rf /var/cache/yum + pip3 install -U pip setuptools wheel --no-cache-dir && \ + pip3 install pipx --no-cache-dir diff --git a/base/build/Dockerfile b/base/build/Dockerfile index 4bafa8f4..d8bb2f35 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -4,27 +4,17 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin \ PIPX_BIN_DIR=/usr/local/bin \ PIPX_HOME=/usr/local/pipx -# A couple of packages are either missing critical-ish files, or didn't make it into the tar -RUN chmod 1777 /tmp && \ - /usr/bin/python3 -c "from configparser import SafeConfigParser; \ -yum_conf = SafeConfigParser(); \ -yum_conf.read('/etc/yum.conf'); \ -yum_conf.has_section('main') or yum_conf.add_section('main'); \ -yum_conf.set('main', 'plugins', '1'); \ -f = open('/etc/yum.conf', 'w'); \ -yum_conf.write(f); \ -f.close();" && \ - rpm --rebuilddb && \ - yum reinstall -y setup pam shadow-utils audit-libs openssl glibc-common glibc && \ +RUN chown root:root /tmp && \ + chmod 1777 /tmp && \ + yum groups mark convert && \ yum groupinstall -y development && \ yum install -y clang cmake docker python27-devel python36-devel \ ImageMagick-devel-6.7.8.9 cairo-devel libssh2-devel libxslt-devel libmpc-devel readline-devel db4-devel \ libffi-devel expat-devel libicu-devel lua-devel gdbm-devel sqlite-devel pcre-devel libcurl-devel && \ + yum clean all && \ alternatives --set gcc /usr/bin/gcc48 && \ alternatives --set g++ /usr/bin/g++48 && \ alternatives --set cpp /usr/bin/cpp48 && \ python3 -m pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ - pipx run awscli==1.* 2>/dev/null || true && \ - yum clean all && \ - rm -rf /var/cache/yum + pipx run awscli==1.* 2>/dev/null || true From 7ece2742a5b0e84eb09d6ed659f123474e619b27 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 6 Aug 2020 10:51:48 -0400 Subject: [PATCH 22/83] Remove hardcoded AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY settings Fixes #303 --- dotnetcore2.0/run/MockBootstraps/MockRuntime.cs | 4 ++-- dotnetcore2.1/run/MockBootstraps/MockRuntime.cs | 4 ++-- go1.x/run/aws-lambda-mock.go | 4 ++-- .../src/main/java/lambdainternal/LambdaRuntime.java | 4 ++-- nodejs4.3/run/awslambda-mock.js | 4 ++-- nodejs6.10/run/awslambda-mock.js | 4 ++-- nodejs8.10/run/awslambda-mock.js | 4 ++-- provided/run/init.go | 4 ++-- python2.7/run/runtime_mock.py | 4 ++-- python3.6/run/runtime_mock.py | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dotnetcore2.0/run/MockBootstraps/MockRuntime.cs b/dotnetcore2.0/run/MockBootstraps/MockRuntime.cs index daa1df4d..7cff6ecc 100644 --- a/dotnetcore2.0/run/MockBootstraps/MockRuntime.cs +++ b/dotnetcore2.0/run/MockBootstraps/MockRuntime.cs @@ -156,8 +156,8 @@ unsafe InvokeData ILambdaRuntime.ReceiveInvoke(IDictionary initialEnvironmentVar RequestId = context.RequestId, AwsCredentials = new AwsCredentials { - AccessKeyId = EnvHelper.GetOrDefault("AWS_ACCESS_KEY_ID", "SOME_ACCESS_KEY_ID"), - SecretAccessKey = EnvHelper.GetOrDefault("AWS_SECRET_ACCESS_KEY", "SOME_SECRET_ACCESS_KEY"), + AccessKeyId = System.Environment.GetEnvironmentVariable("AWS_ACCESS_KEY_ID"), + SecretAccessKey = System.Environment.GetEnvironmentVariable("AWS_SECRET_ACCESS_KEY"), SessionToken = System.Environment.GetEnvironmentVariable("AWS_SESSION_TOKEN") }, XAmznTraceId = xAmznTraceId, diff --git a/dotnetcore2.1/run/MockBootstraps/MockRuntime.cs b/dotnetcore2.1/run/MockBootstraps/MockRuntime.cs index c3827321..51ee0887 100644 --- a/dotnetcore2.1/run/MockBootstraps/MockRuntime.cs +++ b/dotnetcore2.1/run/MockBootstraps/MockRuntime.cs @@ -157,8 +157,8 @@ unsafe InvokeData ILambdaRuntime.ReceiveInvoke(IDictionary initialEnvironmentVar RequestId = context.RequestId, AwsCredentials = new AwsCredentials { - AccessKeyId = EnvHelper.GetOrDefault("AWS_ACCESS_KEY_ID", "SOME_ACCESS_KEY_ID"), - SecretAccessKey = EnvHelper.GetOrDefault("AWS_SECRET_ACCESS_KEY", "SOME_SECRET_ACCESS_KEY"), + AccessKeyId = System.Environment.GetEnvironmentVariable("AWS_ACCESS_KEY_ID"), + SecretAccessKey = System.Environment.GetEnvironmentVariable("AWS_SECRET_ACCESS_KEY"), SessionToken = System.Environment.GetEnvironmentVariable("AWS_SESSION_TOKEN") }, XAmznTraceId = xAmznTraceId, diff --git a/go1.x/run/aws-lambda-mock.go b/go1.x/run/aws-lambda-mock.go index 103a52d9..885f0200 100644 --- a/go1.x/run/aws-lambda-mock.go +++ b/go1.x/run/aws-lambda-mock.go @@ -76,8 +76,8 @@ func main() { } mockContext.ParseTimeout() - awsAccessKey := getEnv("AWS_ACCESS_KEY", getEnv("AWS_ACCESS_KEY_ID", "SOME_ACCESS_KEY_ID")) - awsSecretKey := getEnv("AWS_SECRET_KEY", getEnv("AWS_SECRET_ACCESS_KEY", "SOME_SECRET_ACCESS_KEY")) + awsAccessKey := getEnv("AWS_ACCESS_KEY", os.Getenv("AWS_ACCESS_KEY_ID")) + awsSecretKey := getEnv("AWS_SECRET_KEY", os.Getenv("AWS_SECRET_ACCESS_KEY")) awsSessionToken := getEnv("AWS_SESSION_TOKEN", os.Getenv("AWS_SECURITY_TOKEN")) port := getEnv("_LAMBDA_SERVER_PORT", "54321") diff --git a/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java b/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java index 4737a67d..d7999155 100644 --- a/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java +++ b/java8/run/lambda-runtime-mock/src/main/java/lambdainternal/LambdaRuntime.java @@ -72,8 +72,8 @@ public class LambdaRuntime { FUNCTION_VERSION = getEnvOrDefault("AWS_LAMBDA_FUNCTION_VERSION", "$LATEST"); LOG_GROUP_NAME = getEnvOrDefault("AWS_LAMBDA_LOG_GROUP_NAME", "/aws/lambda/" + FUNCTION_NAME); LOG_STREAM_NAME = getEnvOrDefault("AWS_LAMBDA_LOG_STREAM_NAME", randomLogStreamName(FUNCTION_VERSION)); - AWS_ACCESS_KEY_ID = getEnvOrDefault("AWS_ACCESS_KEY_ID", "SOME_ACCESS_KEY_ID"); - AWS_SECRET_ACCESS_KEY = getEnvOrDefault("AWS_SECRET_ACCESS_KEY", "SOME_SECRET_ACCESS_KEY"); + AWS_ACCESS_KEY_ID = getEnv("AWS_ACCESS_KEY_ID"); + AWS_SECRET_ACCESS_KEY = getEnv("AWS_SECRET_ACCESS_KEY"); AWS_SESSION_TOKEN = getEnv("AWS_SESSION_TOKEN"); AWS_REGION = getEnvOrDefault("AWS_REGION", getEnvOrDefault("AWS_DEFAULT_REGION", "us-east-1")); diff --git a/nodejs4.3/run/awslambda-mock.js b/nodejs4.3/run/awslambda-mock.js index dec5ee15..254062e3 100644 --- a/nodejs4.3/run/awslambda-mock.js +++ b/nodejs4.3/run/awslambda-mock.js @@ -21,8 +21,8 @@ var MEM_SIZE = process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE || '1536' var TIMEOUT = process.env.AWS_LAMBDA_FUNCTION_TIMEOUT || '300' var REGION = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1' var ACCOUNT_ID = process.env.AWS_ACCOUNT_ID || randomAccountId() -var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID || 'SOME_ACCESS_KEY_ID' -var SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY || 'SOME_SECRET_ACCESS_KEY' +var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID +var SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY var SESSION_TOKEN = process.env.AWS_SESSION_TOKEN var INVOKED_ARN = process.env.AWS_LAMBDA_FUNCTION_INVOKED_ARN || arn(REGION, ACCOUNT_ID, FN_NAME) var TRACE_ID = process.env._X_AMZN_TRACE_ID diff --git a/nodejs6.10/run/awslambda-mock.js b/nodejs6.10/run/awslambda-mock.js index dec5ee15..254062e3 100644 --- a/nodejs6.10/run/awslambda-mock.js +++ b/nodejs6.10/run/awslambda-mock.js @@ -21,8 +21,8 @@ var MEM_SIZE = process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE || '1536' var TIMEOUT = process.env.AWS_LAMBDA_FUNCTION_TIMEOUT || '300' var REGION = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1' var ACCOUNT_ID = process.env.AWS_ACCOUNT_ID || randomAccountId() -var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID || 'SOME_ACCESS_KEY_ID' -var SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY || 'SOME_SECRET_ACCESS_KEY' +var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID +var SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY var SESSION_TOKEN = process.env.AWS_SESSION_TOKEN var INVOKED_ARN = process.env.AWS_LAMBDA_FUNCTION_INVOKED_ARN || arn(REGION, ACCOUNT_ID, FN_NAME) var TRACE_ID = process.env._X_AMZN_TRACE_ID diff --git a/nodejs8.10/run/awslambda-mock.js b/nodejs8.10/run/awslambda-mock.js index aaeab76f..ca25a49e 100644 --- a/nodejs8.10/run/awslambda-mock.js +++ b/nodejs8.10/run/awslambda-mock.js @@ -21,8 +21,8 @@ var MEM_SIZE = process.env.AWS_LAMBDA_FUNCTION_MEMORY_SIZE || '1536' var TIMEOUT = process.env.AWS_LAMBDA_FUNCTION_TIMEOUT || '300' var REGION = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION || 'us-east-1' var ACCOUNT_ID = process.env.AWS_ACCOUNT_ID || randomAccountId() -var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID || 'SOME_ACCESS_KEY_ID' -var SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY || 'SOME_SECRET_ACCESS_KEY' +var ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID +var SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY var SESSION_TOKEN = process.env.AWS_SESSION_TOKEN var INVOKED_ARN = process.env.AWS_LAMBDA_FUNCTION_INVOKED_ARN || arn(REGION, ACCOUNT_ID, FN_NAME) var TRACE_ID = process.env._X_AMZN_TRACE_ID diff --git a/provided/run/init.go b/provided/run/init.go index 584f2489..6b9339c2 100644 --- a/provided/run/init.go +++ b/provided/run/init.go @@ -262,8 +262,8 @@ func ensureBootstrapIsRunning(context *mockLambdaContext) error { return fmt.Errorf("Couldn't find valid bootstrap(s): [/var/task/bootstrap /opt/bootstrap]") } - awsAccessKey := getEnv("AWS_ACCESS_KEY", getEnv("AWS_ACCESS_KEY_ID", "SOME_ACCESS_KEY_ID")) - awsSecretKey := getEnv("AWS_SECRET_KEY", getEnv("AWS_SECRET_ACCESS_KEY", "SOME_SECRET_ACCESS_KEY")) + awsAccessKey := getEnv("AWS_ACCESS_KEY", os.Getenv("AWS_ACCESS_KEY_ID")) + awsSecretKey := getEnv("AWS_SECRET_KEY", os.Getenv("AWS_SECRET_ACCESS_KEY")) awsSessionToken := getEnv("AWS_SESSION_TOKEN", os.Getenv("AWS_SECURITY_TOKEN")) bootstrapCmd.Env = append(os.Environ(), diff --git a/python2.7/run/runtime_mock.py b/python2.7/run/runtime_mock.py index 59f428cf..a52ffe80 100644 --- a/python2.7/run/runtime_mock.py +++ b/python2.7/run/runtime_mock.py @@ -38,8 +38,8 @@ DEADLINE_MS = int(time.time() * 1000) + int(os.environ.get('AWS_LAMBDA_FUNCTION_TIMEOUT', '300')) REGION = os.environ.get('AWS_REGION', os.environ.get('AWS_DEFAULT_REGION', 'us-east-1')) ACCOUNT_ID = os.environ.get('AWS_ACCOUNT_ID', random.randint(100000000000, 999999999999)) -ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', 'SOME_ACCESS_KEY_ID') -SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', 'SOME_SECRET_ACCESS_KEY') +ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', None) +SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', None) SESSION_TOKEN = os.environ.get('AWS_SESSION_TOKEN', None) INVOKEID = str(uuid.uuid4()) diff --git a/python3.6/run/runtime_mock.py b/python3.6/run/runtime_mock.py index 59f428cf..a52ffe80 100644 --- a/python3.6/run/runtime_mock.py +++ b/python3.6/run/runtime_mock.py @@ -38,8 +38,8 @@ DEADLINE_MS = int(time.time() * 1000) + int(os.environ.get('AWS_LAMBDA_FUNCTION_TIMEOUT', '300')) REGION = os.environ.get('AWS_REGION', os.environ.get('AWS_DEFAULT_REGION', 'us-east-1')) ACCOUNT_ID = os.environ.get('AWS_ACCOUNT_ID', random.randint(100000000000, 999999999999)) -ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', 'SOME_ACCESS_KEY_ID') -SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', 'SOME_SECRET_ACCESS_KEY') +ACCESS_KEY_ID = os.environ.get('AWS_ACCESS_KEY_ID', None) +SECRET_ACCESS_KEY = os.environ.get('AWS_SECRET_ACCESS_KEY', None) SESSION_TOKEN = os.environ.get('AWS_SESSION_TOKEN', None) INVOKEID = str(uuid.uuid4()) From 7a36e3efc440366c314d9c413aa83dc88b2b730c Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 6 Aug 2020 12:50:15 -0400 Subject: [PATCH 23/83] Update dotnetcore2.1 Bootstrap to match production --- .../run/MockBootstraps/lib/Bootstrap.dll | Bin 147456 -> 147968 bytes .../run/MockBootstraps/lib/Bootstrap.pdb | Bin 44964 -> 45268 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll index 1e9e0796febf86a99471027dc5c25741e5b11b97..a437156cdc904e6ec6438e2ac03861485805b810 100644 GIT binary patch delta 46890 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 z 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 delta 46140 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 Date: Tue, 11 Aug 2020 19:52:38 -0400 Subject: [PATCH 24/83] Update Go to 1.15 --- base/dump-go1x/go.mod | 2 +- examples/go1.x/go.mod | 2 +- go1.x/build/Dockerfile | 2 +- go1.x/run/go.mod | 2 +- provided/run/go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/dump-go1x/go.mod b/base/dump-go1x/go.mod index 54262d7d..1dccccbe 100644 --- a/base/dump-go1x/go.mod +++ b/base/dump-go1x/go.mod @@ -5,4 +5,4 @@ require ( github.com/aws/aws-sdk-go-v2 v0.17.0 ) -go 1.14 +go 1.15 diff --git a/examples/go1.x/go.mod b/examples/go1.x/go.mod index 258e8af4..bcc119a6 100644 --- a/examples/go1.x/go.mod +++ b/examples/go1.x/go.mod @@ -2,4 +2,4 @@ module handler require github.com/aws/aws-lambda-go v1.13.3 -go 1.14 +go 1.15 diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index d2bcafb2..1066c7b2 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -1,7 +1,7 @@ FROM lambci/lambda-base:build # https://golang.org/doc/devel/release.html -ENV GOLANG_VERSION=1.14.4 \ +ENV GOLANG_VERSION=1.15 \ GOPATH=/go \ PATH=/go/bin:/usr/local/go/bin:$PATH \ AWS_EXECUTION_ENV=AWS_Lambda_go1.x diff --git a/go1.x/run/go.mod b/go1.x/run/go.mod index 21bd0b6d..182b72af 100644 --- a/go1.x/run/go.mod +++ b/go1.x/run/go.mod @@ -2,4 +2,4 @@ module aws-lambda-mock require github.com/aws/aws-lambda-go v1.13.3 -go 1.14 +go 1.15 diff --git a/provided/run/go.mod b/provided/run/go.mod index d5e3372d..28c72849 100644 --- a/provided/run/go.mod +++ b/provided/run/go.mod @@ -6,4 +6,4 @@ require ( github.com/rjeczalik/notify v0.9.2 ) -go 1.14 +go 1.15 From 7c8130ae492b60fc20dca90e3068f39f4ad6540d Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 11 Aug 2020 19:52:51 -0400 Subject: [PATCH 25/83] Update gradle to 6.6 --- java11/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 72e3053f..bda58339 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -6,12 +6,12 @@ ENV PATH=/var/lang/bin:$PATH \ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/java11.tgz | tar -zx -C / && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index a63cc78e..1e9bfc69 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -7,12 +7,12 @@ WORKDIR / RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.5.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.5.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 From 9b895e3a7da477f6415b5e57efb4fca271b18666 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 11 Aug 2020 20:33:15 -0400 Subject: [PATCH 26/83] Update dotnetcore3.1 SDK to 3.1.401 --- dotnetcore3.1/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 3a5613a4..dcee793e 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -6,7 +6,7 @@ ENV DOTNET_ROOT=/var/lang/bin ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_dotnetcore3.1 \ - DOTNET_SDK_VERSION=3.1.302 \ + DOTNET_SDK_VERSION=3.1.401 \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip From 2ee33b57126925a8ab4f584952c033adcb82fa3b Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 12 Aug 2020 15:39:57 -0400 Subject: [PATCH 27/83] Add java8.al2 runtime --- .gitignore | 2 + README.md | 2 + .../org.eclipse.buildship.core.prefs | 2 +- base/dump-java8al2/.classpath | 12 +++ base/dump-java8al2/.project | 23 +++++ .../org.eclipse.buildship.core.prefs | 13 +++ .../org.eclipse.core.resources.prefs | 2 + .../.settings/org.eclipse.jdt.core.prefs | 8 ++ base/dump-java8al2/build.gradle | 28 ++++++ .../java/org/lambci/lambda/DumpJava8.java | 88 +++++++++++++++++++ base/publish-all.sh | 2 +- base/tag-all.sh | 2 +- base/test-all.sh | 1 + docker-lambda.code-workspace | 3 + .../org.eclipse.buildship.core.prefs | 2 +- java8.al2/build/Dockerfile | 20 +++++ java8.al2/run/Dockerfile | 21 +++++ 17 files changed, 227 insertions(+), 4 deletions(-) create mode 100644 base/dump-java8al2/.classpath create mode 100644 base/dump-java8al2/.project create mode 100644 base/dump-java8al2/.settings/org.eclipse.buildship.core.prefs create mode 100644 base/dump-java8al2/.settings/org.eclipse.core.resources.prefs create mode 100644 base/dump-java8al2/.settings/org.eclipse.jdt.core.prefs create mode 100644 base/dump-java8al2/build.gradle create mode 100644 base/dump-java8al2/src/main/java/org/lambci/lambda/DumpJava8.java create mode 100644 java8.al2/build/Dockerfile create mode 100644 java8.al2/run/Dockerfile diff --git a/.gitignore b/.gitignore index 4525d854..4a897231 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ base/diff-2 base/tar-find-layer/layer.zip base/dump-java8/bin base/dump-java8/build +base/dump-java8al2/bin +base/dump-java8al2/build base/dump-java11/bin base/dump-java11/build base/dump-dotnetcore20/bin diff --git a/README.md b/README.md index ce2b5d1a..5e0dc318 100644 --- a/README.md +++ b/README.md @@ -310,6 +310,7 @@ These follow the Lambda runtime names: - `ruby2.5` - `ruby2.7` - `java8` + - `java8.al2` - `java11` - `go1.x` - `dotnetcore2.0` @@ -328,6 +329,7 @@ These follow the Lambda runtime names: - `build-ruby2.5` - `build-ruby2.7` - `build-java8` + - `build-java8.al2` - `build-java11` - `build-go1.x` - `build-dotnetcore2.0` diff --git a/base/dump-java8/.settings/org.eclipse.buildship.core.prefs b/base/dump-java8/.settings/org.eclipse.buildship.core.prefs index 39c6821c..90865998 100644 --- a/base/dump-java8/.settings/org.eclipse.buildship.core.prefs +++ b/base/dump-java8/.settings/org.eclipse.buildship.core.prefs @@ -1,7 +1,7 @@ arguments= auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0-20191016123526+0000)) +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= diff --git a/base/dump-java8al2/.classpath b/base/dump-java8al2/.classpath new file mode 100644 index 00000000..4857be40 --- /dev/null +++ b/base/dump-java8al2/.classpath @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/base/dump-java8al2/.project b/base/dump-java8al2/.project new file mode 100644 index 00000000..0e30deb7 --- /dev/null +++ b/base/dump-java8al2/.project @@ -0,0 +1,23 @@ + + + dump-java8 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/base/dump-java8al2/.settings/org.eclipse.buildship.core.prefs b/base/dump-java8al2/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 00000000..90865998 --- /dev/null +++ b/base/dump-java8al2/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home= +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/base/dump-java8al2/.settings/org.eclipse.core.resources.prefs b/base/dump-java8al2/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..2b763404 --- /dev/null +++ b/base/dump-java8al2/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 diff --git a/base/dump-java8al2/.settings/org.eclipse.jdt.core.prefs b/base/dump-java8al2/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..2f5cc74c --- /dev/null +++ b/base/dump-java8al2/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/base/dump-java8al2/build.gradle b/base/dump-java8al2/build.gradle new file mode 100644 index 00000000..77e5fb16 --- /dev/null +++ b/base/dump-java8al2/build.gradle @@ -0,0 +1,28 @@ +apply plugin: 'java' + +sourceCompatibility = '1.8' +targetCompatibility = '1.8' + +repositories { + mavenCentral() +} + +dependencies { + implementation ( + 'com.amazonaws:aws-lambda-java-core:1.2.0', + 'com.amazonaws:aws-lambda-java-events:2.2.7', + 'com.amazonaws:aws-java-sdk-s3:1.11.681' + ) +} + +task buildZip(type: Zip) { + from compileJava + from processResources + into('lib') { + from configurations.runtimeClasspath + } +} + +build.dependsOn buildZip + +// docker run --rm -v "$PWD":/app -w /app gradle:jdk8 gradle build diff --git a/base/dump-java8al2/src/main/java/org/lambci/lambda/DumpJava8.java b/base/dump-java8al2/src/main/java/org/lambci/lambda/DumpJava8.java new file mode 100644 index 00000000..f842aa4a --- /dev/null +++ b/base/dump-java8al2/src/main/java/org/lambci/lambda/DumpJava8.java @@ -0,0 +1,88 @@ +package org.lambci.lambda; + +import java.io.File; +import java.io.IOException; +import java.lang.InterruptedException; +import java.lang.management.ManagementFactory; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.Map; +import java.util.Scanner; + +import com.amazonaws.services.lambda.runtime.Context; +import com.amazonaws.services.lambda.runtime.RequestHandler; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import com.amazonaws.services.s3.model.CannedAccessControlList; +import com.amazonaws.services.s3.model.PutObjectRequest; +import com.amazonaws.services.s3.model.PutObjectResult; + +public class DumpJava8 implements RequestHandler { + + @Override + public PutObjectResult handleRequest(Object input, Context context) { + String filename = "java8.al2.tgz"; + String cmd = "tar -cpzf /tmp/" + filename + " --numeric-owner --ignore-failed-read /var/runtime /var/lang"; + AmazonS3 s3client = AmazonS3ClientBuilder.standard().withRegion("us-east-1").build(); + + System.out.println(ManagementFactory.getRuntimeMXBean().getInputArguments().toString()); + System.out.println(System.getProperty("sun.java.command")); + System.out.println(System.getProperty("java.home")); + System.out.println(System.getProperty("java.library.path")); + System.out.println(System.getProperty("java.class.path")); + System.out.println(System.getProperty("user.dir")); + System.out.println(System.getProperty("user.home")); + System.out.println(System.getProperty("user.name")); + System.out.println(new File(".").getAbsolutePath()); + Map env = System.getenv(); + for (String envName : env.keySet()) { + System.out.println(envName + "=" + env.get(envName)); + } + + try { + int pid = Integer.parseInt(new File("/proc/self").getCanonicalFile().getName()); + + System.out.println("Parent cmdline:"); + System.out.println(new String(Files.readAllBytes(Paths.get("/proc/1/cmdline"))).replace("\0", " ")); + + System.out.println("Parent env:"); + runShell("xargs --null --max-args=1 < /proc/1/environ"); + + System.out.println("This cmdline:"); + System.out.println(new String(Files.readAllBytes(Paths.get("/proc/" + pid + "/cmdline"))).replace("\0", " ")); + + System.out.println("This env:"); + runShell("xargs --null --max-args=1 < /proc/" + pid + "/environ"); + + if (runShell(cmd) != 0) { + return null; + } + + System.out.println("Zipping done! Uploading..."); + + return s3client.putObject(new PutObjectRequest("lambci", "fs/" + filename, new File("/tmp/" + filename)) + .withCannedAcl(CannedAccessControlList.PublicRead)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + public static int runShell(String cmd) throws IOException, InterruptedException { + Process process = Runtime.getRuntime().exec(new String[] { "sh", "-c", cmd }); + + try (Scanner stdoutScanner = new Scanner(process.getInputStream()); + Scanner stderrScanner = new Scanner(process.getErrorStream())) { + // Echo all stdout first + while (stdoutScanner.hasNextLine()) { + System.out.println(stdoutScanner.nextLine()); + } + // Then echo stderr + while (stderrScanner.hasNextLine()) { + System.err.println(stderrScanner.nextLine()); + } + } + + process.waitFor(); + return process.exitValue(); + } +} diff --git a/base/publish-all.sh b/base/publish-all.sh index 53bfce6b..e1580b82 100755 --- a/base/publish-all.sh +++ b/base/publish-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java11 dotnetcore3.1" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" echo -n "Enter repository passphrase: " read -s DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE diff --git a/base/tag-all.sh b/base/tag-all.sh index 8b9c0827..c68f7292 100755 --- a/base/tag-all.sh +++ b/base/tag-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java11 dotnetcore3.1" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" git tag -f latest diff --git a/base/test-all.sh b/base/test-all.sh index aa0e1a8c..044cd6ee 100755 --- a/base/test-all.sh +++ b/base/test-all.sh @@ -36,6 +36,7 @@ docker run --rm -v "$PWD":/var/task lambci/lambda:ruby2.7 lambda_function.lambda cd ${EXAMPLES_DIR}/java docker run --rm -v "$PWD":/app -w /app lambci/lambda:build-java8 gradle build docker run --rm -v "$PWD/build/docker":/var/task lambci/lambda:java8 org.lambci.lambda.ExampleHandler '{"some": "event"}' +docker run --rm -v "$PWD/build/docker":/var/task lambci/lambda:java8.al2 org.lambci.lambda.ExampleHandler '{"some": "event"}' docker run --rm -v "$PWD/build/docker":/var/task lambci/lambda:java11 org.lambci.lambda.ExampleHandler '{"some": "event"}' cd ${EXAMPLES_DIR}/dotnetcore2.0 diff --git a/docker-lambda.code-workspace b/docker-lambda.code-workspace index 32ca28b3..975aee7f 100644 --- a/docker-lambda.code-workspace +++ b/docker-lambda.code-workspace @@ -21,6 +21,9 @@ { "path": "base/dump-java8" }, + { + "path": "base/dump-java8al2" + }, { "path": "examples/java" }, diff --git a/examples/java/.settings/org.eclipse.buildship.core.prefs b/examples/java/.settings/org.eclipse.buildship.core.prefs index 39c6821c..90865998 100644 --- a/examples/java/.settings/org.eclipse.buildship.core.prefs +++ b/examples/java/.settings/org.eclipse.buildship.core.prefs @@ -1,7 +1,7 @@ arguments= auto.sync=false build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.0-20191016123526+0000)) +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) connection.project.dir= eclipse.preferences.version=1 gradle.user.home= diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile new file mode 100644 index 00000000..df669031 --- /dev/null +++ b/java8.al2/build/Dockerfile @@ -0,0 +1,20 @@ +FROM lambci/lambda-base-2:build + +ENV AWS_EXECUTION_ENV=AWS_Lambda_rapid + +WORKDIR / + +RUN rm -rf /var/runtime /var/lang && \ + curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ + yum install -y java-1.8.0-openjdk-devel && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ + unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ + curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ + tar -zx -C /usr/local/maven + +ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" + +# Add these as a separate layer as they get updated frequently +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==1.0.0 diff --git a/java8.al2/run/Dockerfile b/java8.al2/run/Dockerfile new file mode 100644 index 00000000..7c912988 --- /dev/null +++ b/java8.al2/run/Dockerfile @@ -0,0 +1,21 @@ +FROM lambci/lambda-base + +RUN curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C /opt + + +FROM lambci/lambda:provided + + +FROM lambci/lambda-base-2 + +ENV PATH=/var/lang/bin:$PATH \ + LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ + AWS_EXECUTION_ENV=AWS_Lambda_rapid + +COPY --from=0 /opt/* /var/ + +COPY --from=1 /var/runtime/init /var/rapid/init + +USER sbx_user1051 + +ENTRYPOINT ["/var/rapid/init", "--bootstrap", "/var/runtime/bootstrap", "--enable-msg-logs"] From 644e1035b8720e719b75c5bb1faa1ecc2366dcb1 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 12 Aug 2020 16:08:03 -0400 Subject: [PATCH 28/83] Fix path for java8.al2 tarball --- java8/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 1e9bfc69..31a34c2d 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -5,7 +5,7 @@ ENV AWS_EXECUTION_ENV=AWS_Lambda_java8 WORKDIR / RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ + curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ From 2d48569a26bd5a2f2b1fa0fe9eb3500d0e05714c Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 12 Aug 2020 16:20:35 -0400 Subject: [PATCH 29/83] Add java8.al2 to build-all script --- base/build-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/build-all.sh b/base/build-all.sh index 88ad7919..914a9cff 100755 --- a/base/build-all.sh +++ b/base/build-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java11 dotnetcore3.1" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" TOP_DIR="${PWD}/.." From 8a91a64714c10c11e1b0f0fdd5a5afa365fb9ea0 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 12 Aug 2020 16:39:19 -0400 Subject: [PATCH 30/83] Add provided.al2 runtime --- .gitignore | 4 ++ README.md | 2 + base/build-all.sh | 2 +- base/dump-providedal2/bootstrap.go | 87 ++++++++++++++++++++++++++++++ base/dump-providedal2/go.mod | 8 +++ base/dump-providedal2/go.sum | 26 +++++++++ base/publish-all.sh | 2 +- base/tag-all.sh | 2 +- base/test-all.sh | 4 ++ examples/provided.al2/bootstrap.go | 27 ++++++++++ examples/provided.al2/go.mod | 8 +++ examples/provided.al2/go.sum | 27 ++++++++++ provided.al2/build/Dockerfile | 6 +++ provided.al2/run/Dockerfile | 13 +++++ 14 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 base/dump-providedal2/bootstrap.go create mode 100644 base/dump-providedal2/go.mod create mode 100644 base/dump-providedal2/go.sum create mode 100644 examples/provided.al2/bootstrap.go create mode 100644 examples/provided.al2/go.mod create mode 100644 examples/provided.al2/go.sum create mode 100644 provided.al2/build/Dockerfile create mode 100644 provided.al2/run/Dockerfile diff --git a/.gitignore b/.gitignore index 4a897231..f335be0f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ base/dump-dotnetcore21/bin base/dump-dotnetcore21/obj base/dump-dotnetcore31/bin base/dump-dotnetcore31/obj +base/dump-providedal2/bootstrap +base/dump-providedal2/bootstrap.zip dotnetcore2.0/run/MockBootstraps/bin dotnetcore2.0/run/MockBootstraps/obj dotnetcore2.1/run/MockBootstraps/bin @@ -35,3 +37,5 @@ examples/dotnetcore3.1/pub examples/java/bin examples/java/build examples/go1.x/handler +examples/go1.x/handler +examples/provided.al2/bootstrap diff --git a/README.md b/README.md index 5e0dc318..df924a37 100644 --- a/README.md +++ b/README.md @@ -317,6 +317,7 @@ These follow the Lambda runtime names: - `dotnetcore2.1` - `dotnetcore3.1` - `provided` + - `provided.al2` - `build-nodejs4.3` - `build-nodejs6.10` - `build-nodejs8.10` @@ -336,6 +337,7 @@ These follow the Lambda runtime names: - `build-dotnetcore2.1` - `build-dotnetcore3.1` - `build-provided` + - `build-provided.al2` ## Verifying images diff --git a/base/build-all.sh b/base/build-all.sh index 914a9cff..9a0e6e31 100755 --- a/base/build-all.sh +++ b/base/build-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" TOP_DIR="${PWD}/.." diff --git a/base/dump-providedal2/bootstrap.go b/base/dump-providedal2/bootstrap.go new file mode 100644 index 00000000..a0f1d7b3 --- /dev/null +++ b/base/dump-providedal2/bootstrap.go @@ -0,0 +1,87 @@ +// docker run --rm -v "$PWD":/go/src/handler lambci/lambda:build-go1.x sh -c \ +// 'go mod download && go build -tags lambda.norpc -ldflags="-s -w" bootstrap.go' && \ +// zip bootstrap.zip bootstrap + +package main + +import ( + "context" + "fmt" + "io/ioutil" + "log" + "os" + "os/exec" + "strings" + + "github.com/aws/aws-lambda-go/lambda" + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/aws/external" + "github.com/aws/aws-sdk-go-v2/service/s3" +) + +func handleRequest(ctx context.Context, event interface{}) (*s3.PutObjectResponse, error) { + filename := "provided.al2.tgz" + + runShell("tar -cpzf /tmp/" + filename + " --numeric-owner --ignore-failed-read /var/runtime /var/lang") + + fmt.Println("Zipping done! Uploading...") + + cfg, err := external.LoadDefaultAWSConfig() + if err != nil { + log.Fatal(err) + } + + file, err := os.Open("/tmp/" + filename) + if err != nil { + log.Fatal(err) + } + + resp, err := s3.New(cfg).PutObjectRequest(&s3.PutObjectInput{ + ACL: s3.ObjectCannedACLPublicRead, + Body: file, + Bucket: aws.String("lambci"), + Key: aws.String("fs/" + filename), + }).Send(context.Background()) + if err != nil { + log.Fatal(err) + } + + fmt.Println("Uploading done!") + + fmt.Println("Parent env:") + runShell("xargs --null --max-args=1 < /proc/1/environ") + + fmt.Println("Parent cmdline:") + content, err := ioutil.ReadFile("/proc/1/cmdline") + fmt.Println(strings.ReplaceAll(string(content), "\x00", " ")) + + fmt.Println("os.Args:") + for _, a := range os.Args { + fmt.Println(a) + } + + fmt.Println("os.Getwd:") + pwd, _ := os.Getwd() + fmt.Println(pwd) + + fmt.Println("os.Environ:") + for _, e := range os.Environ() { + fmt.Println(e) + } + + fmt.Println("ctx:") + fmt.Println(ctx) + + return resp, nil +} + +func runShell(shellCmd string) { + cmd := exec.Command("sh", "-c", shellCmd) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.Run() +} + +func main() { + lambda.Start(handleRequest) +} diff --git a/base/dump-providedal2/go.mod b/base/dump-providedal2/go.mod new file mode 100644 index 00000000..4fc94c95 --- /dev/null +++ b/base/dump-providedal2/go.mod @@ -0,0 +1,8 @@ +module bootstrap + +require ( + github.com/aws/aws-lambda-go v1.19.0 + github.com/aws/aws-sdk-go-v2 v0.24.0 +) + +go 1.15 diff --git a/base/dump-providedal2/go.sum b/base/dump-providedal2/go.sum new file mode 100644 index 00000000..0b1fc768 --- /dev/null +++ b/base/dump-providedal2/go.sum @@ -0,0 +1,26 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aws/aws-lambda-go v1.19.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= +github.com/aws/aws-sdk-go-v2 v0.24.0/go.mod h1:2LhT7UgHOXK3UXONKI5OMgIyoQL6zTAw/jwIeX6yqzw= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/base/publish-all.sh b/base/publish-all.sh index e1580b82..9cdc5d45 100755 --- a/base/publish-all.sh +++ b/base/publish-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" echo -n "Enter repository passphrase: " read -s DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE diff --git a/base/tag-all.sh b/base/tag-all.sh index c68f7292..0591bf34 100755 --- a/base/tag-all.sh +++ b/base/tag-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" git tag -f latest diff --git a/base/test-all.sh b/base/test-all.sh index 044cd6ee..c6a40c0e 100755 --- a/base/test-all.sh +++ b/base/test-all.sh @@ -58,6 +58,10 @@ docker run --rm -v "$PWD":/var/task lambci/lambda:go1.x handler '{"Records": []} cd ${EXAMPLES_DIR}/provided docker run --rm -v "$PWD":/var/task lambci/lambda:provided handler '{"some": "event"}' +cd ${EXAMPLES_DIR}/provided.al2 +docker run --rm -v "$PWD":/go/src/handler lambci/lambda:build-go1.x sh -c 'go mod download && go build -tags lambda.norpc bootstrap.go' +docker run --rm -v "$PWD":/var/task lambci/lambda:provided.al2 handler '{"Records": []}' + # To invoke and keep open: # cd ${EXAMPLES_DIR}/ruby # docker run --rm -v $PWD:/var/task -e DOCKER_LAMBDA_STAY_OPEN=1 -p 9001:9001 \ diff --git a/examples/provided.al2/bootstrap.go b/examples/provided.al2/bootstrap.go new file mode 100644 index 00000000..e71e3518 --- /dev/null +++ b/examples/provided.al2/bootstrap.go @@ -0,0 +1,27 @@ +// Compile with: +// docker run --rm -v "$PWD":/go/src/handler lambci/lambda:build-go1.x sh -c 'go mod download && go build -tags lambda.norpc bootstrap.go' + +// Run with: +// docker run --rm -v "$PWD":/var/task lambci/lambda:provided.al2 handler '{"Records": []}' + +package main + +import ( + "context" + "fmt" + + "github.com/aws/aws-lambda-go/events" + "github.com/aws/aws-lambda-go/lambda" +) + +func handleRequest(ctx context.Context, event events.S3Event) (string, error) { + fmt.Println(ctx) + + fmt.Println(event) + + return "Hello World!", nil +} + +func main() { + lambda.Start(handleRequest) +} diff --git a/examples/provided.al2/go.mod b/examples/provided.al2/go.mod new file mode 100644 index 00000000..4fc94c95 --- /dev/null +++ b/examples/provided.al2/go.mod @@ -0,0 +1,8 @@ +module bootstrap + +require ( + github.com/aws/aws-lambda-go v1.19.0 + github.com/aws/aws-sdk-go-v2 v0.24.0 +) + +go 1.15 diff --git a/examples/provided.al2/go.sum b/examples/provided.al2/go.sum new file mode 100644 index 00000000..8da6f30f --- /dev/null +++ b/examples/provided.al2/go.sum @@ -0,0 +1,27 @@ +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/aws/aws-lambda-go v1.19.0 h1:Cn28zA8Mic4NpR7p4IlaEW2srI+U3+I7tRqjFMpt/fs= +github.com/aws/aws-lambda-go v1.19.0/go.mod h1:jJmlefzPfGnckuHdXX7/80O3BvUUi12XOkbv4w9SGLU= +github.com/aws/aws-sdk-go-v2 v0.24.0/go.mod h1:2LhT7UgHOXK3UXONKI5OMgIyoQL6zTAw/jwIeX6yqzw= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile new file mode 100644 index 00000000..cf5e84ea --- /dev/null +++ b/provided.al2/build/Dockerfile @@ -0,0 +1,6 @@ +FROM lambci/lambda-base-2:build + +# Add these as a separate layer as they get updated frequently +RUN pipx install awscli==1.* && \ + pipx install aws-lambda-builders==1.0.0 && \ + pipx install aws-sam-cli==1.0.0 diff --git a/provided.al2/run/Dockerfile b/provided.al2/run/Dockerfile new file mode 100644 index 00000000..19e39287 --- /dev/null +++ b/provided.al2/run/Dockerfile @@ -0,0 +1,13 @@ +FROM lambci/lambda:provided + + +FROM lambci/lambda-base-2 + +ENV PATH=/var/lang/bin:$PATH \ + LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH + +COPY --from=0 /var/runtime/init /var/runtime/init + +USER sbx_user1051 + +ENTRYPOINT ["/var/runtime/init"] From b36a9e9195cc9ffad667c9ced210962b779c57d0 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 12 Aug 2020 16:42:54 -0400 Subject: [PATCH 31/83] *Really* fix path for java8.al2 tarball --- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index df669031..920a5cfb 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -5,7 +5,7 @@ ENV AWS_EXECUTION_ENV=AWS_Lambda_rapid WORKDIR / RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ + curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 31a34c2d..1e9bfc69 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -5,7 +5,7 @@ ENV AWS_EXECUTION_ENV=AWS_Lambda_java8 WORKDIR / RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C / && \ + curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ From 63efae981cbabeda26ce6c05458a17b4c16666c1 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 12 Aug 2020 21:19:52 -0400 Subject: [PATCH 32/83] Update aws-sam-cli to 1.1.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 3 +-- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 34c89f9c..2ea4bb08 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -26,6 +26,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 7f52d4b8..69c765d5 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -27,7 +27,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 && \ + pipx install aws-sam-cli==1.1.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index dcee793e..8868f243 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -22,7 +22,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 && \ + pipx install aws-sam-cli==1.1.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 1066c7b2..7e0d2162 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -20,6 +20,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index bda58339..557a2600 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -16,4 +16,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 920a5cfb..e1ca8445 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -6,7 +6,6 @@ WORKDIR / RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C / && \ - yum install -y java-1.8.0-openjdk-devel && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ @@ -17,4 +16,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 1e9bfc69..e526e1b3 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -19,4 +19,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/b RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 8e3603e5..84c48611 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index f9389348..c95ab18c 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 38c8bd39..c029f7d6 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 43562b51..7a50d8f6 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 551d0df0..07a537ce 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index cf5e84ea..e8fb0ed8 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -3,4 +3,4 @@ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 6c83f670..3e04210a 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -5,4 +5,4 @@ FROM lambci/lambda-base:build RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 197e3afe..2396e3ed 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -26,4 +26,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index e0275280..56632d18 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 70f9ec9d..8b17b047 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 + pipx install aws-sam-cli==1.1.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 6acd3477..7e49af84 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -16,6 +16,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 && \ + pipx install aws-sam-cli==1.1.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 4c3d059e..a5a0e4bc 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.0.0 && \ + pipx install aws-sam-cli==1.1.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 2b4ab8c6a98bdd1eb17394598d287f4d6e854748 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 13 Aug 2020 20:57:30 -0400 Subject: [PATCH 33/83] Fix JDK on java8.al2 --- java8.al2/build/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index e1ca8445..73fcb5f6 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -1,11 +1,14 @@ FROM lambci/lambda-base-2:build -ENV AWS_EXECUTION_ENV=AWS_Lambda_rapid +ENV PATH=/var/lang/bin:$PATH \ + LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ + AWS_EXECUTION_ENV=AWS_Lambda_rapid -WORKDIR / - -RUN rm -rf /var/runtime /var/lang && \ +RUN rm -rf /var/runtime && \ curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C / && \ + rm -rf /var/lang/* && \ + curl -sSL https://corretto.aws/downloads/resources/8.252.09.1/amazon-corretto-8.252.09.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ + rm -rf /var/lang/*.zip && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ From 7f6815f1661a8bb8745bd4dfe9bd7e3b1ba0136d Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 18 Aug 2020 10:36:51 -0400 Subject: [PATCH 34/83] Remove date-tagged image locally after publishing --- base/publish-all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/base/publish-all.sh b/base/publish-all.sh index 9cdc5d45..da170994 100755 --- a/base/publish-all.sh +++ b/base/publish-all.sh @@ -29,4 +29,5 @@ for RUNTIME in $RUNTIMES; do docker tag lambci/lambda:build-${RUNTIME} lambci/lambda:${PUBLISH_DATE}-build-${RUNTIME} docker push lambci/lambda:build-${RUNTIME} docker push lambci/lambda:${PUBLISH_DATE}-build-${RUNTIME} + docker rmi lambci/lambda:${PUBLISH_DATE}-build-${RUNTIME} done From 42582d6fa2066d591ef0ce61170f4304dffbcecc Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 20 Aug 2020 13:09:02 -0400 Subject: [PATCH 35/83] Quieten unzipping in java builds --- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 557a2600..9165d29e 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -7,7 +7,7 @@ ENV PATH=/var/lang/bin:$PATH \ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/java11.tgz | tar -zx -C / && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ - unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ + unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 73fcb5f6..4cbcc42f 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -10,7 +10,7 @@ RUN rm -rf /var/runtime && \ curl -sSL https://corretto.aws/downloads/resources/8.252.09.1/amazon-corretto-8.252.09.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ rm -rf /var/lang/*.zip && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ - unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ + unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index e526e1b3..de0e2309 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -8,7 +8,7 @@ RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ - unzip -d /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ + unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven From a64a88947030c9bd3b3a35160349851be2969a18 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 20 Aug 2020 13:09:17 -0400 Subject: [PATCH 36/83] Bump bcrypt dep in example --- .../nodejs-native-module/package-lock.json | 38 +++++++++---------- examples/nodejs-native-module/package.json | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/nodejs-native-module/package-lock.json b/examples/nodejs-native-module/package-lock.json index 4efd95c6..1beaa4c1 100644 --- a/examples/nodejs-native-module/package-lock.json +++ b/examples/nodejs-native-module/package-lock.json @@ -34,12 +34,12 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "bcrypt": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-4.0.1.tgz", - "integrity": "sha512-hSIZHkUxIDS5zA2o00Kf2O5RfVbQ888n54xQoF/eIaquU4uaLxK8vhhBdktd0B3n2MjkcAWzv4mnhogykBKOUQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.0.0.tgz", + "integrity": "sha512-jB0yCBl4W/kVHM2whjfyqnxTmOHkCX4kHEa5nYKSoGeYe8YrjTYTc87/6bwt1g8cmV0QrbhKriETg9jWtcREhg==", "requires": { - "node-addon-api": "^2.0.0", - "node-pre-gyp": "0.14.0" + "node-addon-api": "^3.0.0", + "node-pre-gyp": "0.15.0" } }, "brace-expansion": { @@ -224,9 +224,9 @@ } }, "mkdirp": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz", - "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { "minimist": "^1.2.5" } @@ -237,9 +237,9 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "needle": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.3.tgz", - "integrity": "sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/needle/-/needle-2.5.0.tgz", + "integrity": "sha512-o/qITSDR0JCyCKEQ1/1bnUXMmznxabbwi/Y4WwJElf+evwJNFNwIDMCCt5IigFVxgeGBJESLohGtIS9gEzo1fA==", "requires": { "debug": "^3.2.6", "iconv-lite": "^0.4.4", @@ -247,18 +247,18 @@ } }, "node-addon-api": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz", - "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.0.0.tgz", + "integrity": "sha512-sSHCgWfJ+Lui/u+0msF3oyCgvdkhxDbkCS6Q8uiJquzOimkJBvX6hl5aSSA7DR1XbMpdM8r7phjcF63sF4rkKg==" }, "node-pre-gyp": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz", - "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==", + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz", + "integrity": "sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA==", "requires": { "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", + "mkdirp": "^0.5.3", + "needle": "^2.5.0", "nopt": "^4.0.1", "npm-packlist": "^1.1.6", "npmlog": "^4.0.2", diff --git a/examples/nodejs-native-module/package.json b/examples/nodejs-native-module/package.json index 7a043bda..1917e45b 100644 --- a/examples/nodejs-native-module/package.json +++ b/examples/nodejs-native-module/package.json @@ -7,6 +7,6 @@ "test": "node test.js" }, "dependencies": { - "bcrypt": "^4.0.1" + "bcrypt": "^5.0.0" } } From 91cf2ab632ec456af72eedc944f0dedc4452782f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 20 Aug 2020 13:09:38 -0400 Subject: [PATCH 37/83] Update dotnetcore2.1 bootstrap to match latest prod --- .../run/MockBootstraps/lib/Bootstrap.dll | Bin 147968 -> 147968 bytes .../run/MockBootstraps/lib/Bootstrap.pdb | Bin 45268 -> 45932 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll index a437156cdc904e6ec6438e2ac03861485805b810..2adc509b9298cd3e15d84431b050b26ebc7b59de 100644 GIT binary patch delta 8260 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 delta 8333 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 Date: Tue, 25 Aug 2020 13:36:21 -0400 Subject: [PATCH 38/83] Update gradle to 6.6.1 on all java build images --- java11/build/Dockerfile | 4 ++-- java8.al2/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 9165d29e..d3920773 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -6,12 +6,12 @@ ENV PATH=/var/lang/bin:$PATH \ RUN rm -rf /var/runtime /var/lang /var/rapid && \ curl https://lambci.s3.amazonaws.com/fs/java11.tgz | tar -zx -C / && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 4cbcc42f..d774151a 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -9,12 +9,12 @@ RUN rm -rf /var/runtime && \ rm -rf /var/lang/* && \ curl -sSL https://corretto.aws/downloads/resources/8.252.09.1/amazon-corretto-8.252.09.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ rm -rf /var/lang/*.zip && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index de0e2309..04a3ed4b 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -7,12 +7,12 @@ WORKDIR / RUN rm -rf /var/runtime /var/lang && \ curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.6/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 From 51711e917c481053c612c331467e9b4e51cb6272 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 2 Sep 2020 17:14:42 -0400 Subject: [PATCH 39/83] Remove package-lock.json from git --- .gitignore | 1 + package-lock.json | 43 ------------------------------------------- 2 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 package-lock.json diff --git a/.gitignore b/.gitignore index f335be0f..97b322a1 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ examples/java/build examples/go1.x/handler examples/go1.x/handler examples/provided.al2/bootstrap +package-lock.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index fb3fd99b..00000000 --- a/package-lock.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "docker-lambda", - "version": "0.15.3", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "should": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/should/-/should-8.4.0.tgz", - "integrity": "sha1-XmCInT5kS73Tl6MM00+tKPz5C8A=", - "dev": true, - "requires": { - "should-equal": "0.8.0", - "should-format": "0.3.2", - "should-type": "0.2.0" - } - }, - "should-equal": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-0.8.0.tgz", - "integrity": "sha1-o/BXMv9FusG3ukEvhAiFaBlkEpk=", - "dev": true, - "requires": { - "should-type": "0.2.0" - } - }, - "should-format": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/should-format/-/should-format-0.3.2.tgz", - "integrity": "sha1-pZgx4Bot3uFJkRvHFIvlyAMZ4f8=", - "dev": true, - "requires": { - "should-type": "0.2.0" - } - }, - "should-type": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/should-type/-/should-type-0.2.0.tgz", - "integrity": "sha1-ZwfvlVKdmJ3MCY/gdTqx+RNrt/Y=", - "dev": true - } - } -} From fe2760e99a568d3816a7d926e36b572570173c3a Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 4 Sep 2020 08:27:28 -0400 Subject: [PATCH 40/83] Update aws-lambda-builders and aws-sam-cli --- dotnetcore2.0/build/Dockerfile | 4 ++-- dotnetcore2.1/build/Dockerfile | 4 ++-- dotnetcore3.1/build/Dockerfile | 4 ++-- go1.x/build/Dockerfile | 4 ++-- java11/build/Dockerfile | 4 ++-- java8.al2/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- nodejs10.x/build/Dockerfile | 4 ++-- nodejs12.x/build/Dockerfile | 4 ++-- nodejs4.3/build/Dockerfile | 4 ++-- nodejs6.10/build/Dockerfile | 4 ++-- nodejs8.10/build/Dockerfile | 4 ++-- provided.al2/build/Dockerfile | 4 ++-- provided/build/Dockerfile | 4 ++-- python3.6/build/Dockerfile | 4 ++-- python3.7/build/Dockerfile | 4 ++-- python3.8/build/Dockerfile | 4 ++-- ruby2.5/build/Dockerfile | 4 ++-- ruby2.7/build/Dockerfile | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 2ea4bb08..7972fb81 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -25,7 +25,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 69c765d5..e5201f3f 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -26,8 +26,8 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 && \ + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 8868f243..203c6169 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -21,8 +21,8 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 && \ + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 7e0d2162..fe38995c 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -19,7 +19,7 @@ RUN rm -rf /var/runtime /var/lang && \ # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index d3920773..ec6170d3 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -15,5 +15,5 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index d774151a..622dd0b4 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -18,5 +18,5 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 04a3ed4b..28880ad8 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -18,5 +18,5 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 84c48611..ec77907b 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -10,5 +10,5 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index c95ab18c..13e3d46f 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -10,5 +10,5 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index c029f7d6..84584a60 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -13,7 +13,7 @@ RUN rm -rf /var/runtime /var/lang && \ # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 7a50d8f6..426be790 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -13,7 +13,7 @@ RUN rm -rf /var/runtime /var/lang && \ # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 07a537ce..27ce85a2 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -13,7 +13,7 @@ RUN rm -rf /var/runtime /var/lang && \ # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index e8fb0ed8..78a57c0f 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -2,5 +2,5 @@ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 3e04210a..a965582a 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -4,5 +4,5 @@ FROM lambci/lambda-base:build # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 2396e3ed..cb8fecce 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -25,5 +25,5 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install pipenv && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 56632d18..ad5f9da9 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -17,5 +17,5 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install pipenv && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 8b17b047..ea9be052 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -17,5 +17,5 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install pipenv && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 7e49af84..24629792 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -15,7 +15,7 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 && \ + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index a5a0e4bc..3fa80f40 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -13,7 +13,7 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.0.0 && \ - pipx install aws-sam-cli==1.1.0 && \ + pipx install aws-lambda-builders==1.1.0 && \ + pipx install aws-sam-cli==1.2.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From d318d7e1e0402bc246472facd4da9cc27069914f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 9 Sep 2020 10:11:28 -0400 Subject: [PATCH 41/83] Update dotnetcore3.1 sdk to 3.1.402 --- dotnetcore3.1/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 203c6169..2f230a03 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -6,7 +6,7 @@ ENV DOTNET_ROOT=/var/lang/bin ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_dotnetcore3.1 \ - DOTNET_SDK_VERSION=3.1.401 \ + DOTNET_SDK_VERSION=3.1.402 \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip From 33c7d80700f849a2ec37794a238c39ad3a11d071 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 11 Sep 2020 11:04:51 -0400 Subject: [PATCH 42/83] =?UTF-8?q?VSCode=20wants=20to=20add=20filteredResou?= =?UTF-8?q?rces=20to=20java=20.project=20files=20=F0=9F=A4=B7=E2=80=8D?= =?UTF-8?q?=E2=99=82=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/dump-java11/.project | 11 ++++++ base/dump-java8/.project | 51 ++++++++++++++++---------- base/dump-java8al2/.project | 51 ++++++++++++++++---------- examples/java/.project | 11 ++++++ java8/run/lambda-runtime-mock/.project | 39 +++++++++++++------- 5 files changed, 109 insertions(+), 54 deletions(-) diff --git a/base/dump-java11/.project b/base/dump-java11/.project index 47ed2d4d..52873e92 100644 --- a/base/dump-java11/.project +++ b/base/dump-java11/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature + + + 1599680497019 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/base/dump-java8/.project b/base/dump-java8/.project index 0e30deb7..848abc21 100644 --- a/base/dump-java8/.project +++ b/base/dump-java8/.project @@ -1,23 +1,34 @@ - dump-java8 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - + dump-java8 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + + 1599680497033 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/base/dump-java8al2/.project b/base/dump-java8al2/.project index 0e30deb7..b3dcbd7f 100644 --- a/base/dump-java8al2/.project +++ b/base/dump-java8al2/.project @@ -1,23 +1,34 @@ - dump-java8 - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.buildship.core.gradleprojectnature - + dump-java8 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + + 1599680497040 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/examples/java/.project b/examples/java/.project index b4c37dd9..123c68bd 100644 --- a/examples/java/.project +++ b/examples/java/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature + + + 1599680497045 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/java8/run/lambda-runtime-mock/.project b/java8/run/lambda-runtime-mock/.project index e2f6a921..f980c6e2 100644 --- a/java8/run/lambda-runtime-mock/.project +++ b/java8/run/lambda-runtime-mock/.project @@ -1,17 +1,28 @@ - lambda-runtime-mock - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - + lambda-runtime-mock + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + + + 1599680497051 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + From ba348567412478a65a687c7a95272be1fabcf563 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 11 Sep 2020 19:10:59 -0400 Subject: [PATCH 43/83] Bump ImageMagick to 6.9.10.68 in base build image --- base/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/build/Dockerfile b/base/build/Dockerfile index d8bb2f35..3a61529f 100644 --- a/base/build/Dockerfile +++ b/base/build/Dockerfile @@ -9,7 +9,7 @@ RUN chown root:root /tmp && \ yum groups mark convert && \ yum groupinstall -y development && \ yum install -y clang cmake docker python27-devel python36-devel \ - ImageMagick-devel-6.7.8.9 cairo-devel libssh2-devel libxslt-devel libmpc-devel readline-devel db4-devel \ + ImageMagick-devel-6.9.10.68 cairo-devel libssh2-devel libxslt-devel libmpc-devel readline-devel db4-devel \ libffi-devel expat-devel libicu-devel lua-devel gdbm-devel sqlite-devel pcre-devel libcurl-devel && \ yum clean all && \ alternatives --set gcc /usr/bin/gcc48 && \ From 94efe99e92f09c516f4698f87c3cf86124d3ce9c Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 11 Sep 2020 19:11:21 -0400 Subject: [PATCH 44/83] Bump glibc version in base-2 image --- base/base-2/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/base-2/Dockerfile b/base/base-2/Dockerfile index 4e522317..41750c26 100644 --- a/base/base-2/Dockerfile +++ b/base/base-2/Dockerfile @@ -6,7 +6,7 @@ FROM amazonlinux:2 ADD ./base-2.tgz /opt/ RUN yum --installroot=/opt reinstall -y filesystem-3.2-25.amzn2.0.4 \ - setup-2.8.71-10.amzn2.0.1 glibc-2.26-34.amzn2 glibc-common-2.26-34.amzn2 && \ + setup-2.8.71-10.amzn2.0.1 glibc-2.26-35.amzn2 glibc-common-2.26-35.amzn2 && \ yum --installroot=/opt clean all FROM scratch From 72a9a219e35e80aea8988922542c898e5230837f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 15 Sep 2020 08:53:09 -0400 Subject: [PATCH 45/83] Update packages list to match latest images --- base/amazonlinux1.txt | 24 +++++++++++----------- base/base-2/amazonlinux2.txt | 40 ++++++++++++++++++------------------ base/base-2/packages.txt | 22 ++++++++++---------- base/packages.txt | 30 +++++++++++++-------------- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/base/amazonlinux1.txt b/base/amazonlinux1.txt index dbb5fa6d..a02b765a 100644 --- a/base/amazonlinux1.txt +++ b/base/amazonlinux1.txt @@ -1,10 +1,10 @@ basesystem-10.0-4.9.amzn1.noarch -bash-4.2.46-28.37.amzn1.x86_64 +bash-4.2.46-34.43.amzn1.x86_64 bzip2-libs-1.0.6-8.12.amzn1.x86_64 ca-certificates-2018.2.22-65.1.22.amzn1.noarch chkconfig-1.3.49.3-2.14.amzn1.x86_64 coreutils-8.22-15.52.amzn1.x86_64 -curl-7.61.1-12.93.amzn1.x86_64 +curl-7.61.1-12.94.amzn1.x86_64 cyrus-sasl-lib-2.1.23-13.16.amzn1.x86_64 db4-4.7.25-18.11.amzn1.x86_64 db4-utils-4.7.25-18.11.amzn1.x86_64 @@ -30,14 +30,14 @@ libassuan-2.0.3-3.3.amzn1.x86_64 libattr-2.4.46-12.10.amzn1.x86_64 libcap-2.16-5.5.8.amzn1.x86_64 libcom_err-1.43.5-2.43.amzn1.x86_64 -libcurl-7.61.1-12.93.amzn1.x86_64 +libcurl-7.61.1-12.94.amzn1.x86_64 libffi-3.0.13-16.5.amzn1.x86_64 libgcc72-7.2.1-2.59.amzn1.x86_64 libgcrypt-1.5.3-12.19.amzn1.x86_64 libgpg-error-1.11-1.12.amzn1.x86_64 libicu-50.2-4.0.amzn1.x86_64 libidn2-2.3.0-1.4.amzn1.x86_64 -libnghttp2-1.31.1-2.5.amzn1.x86_64 +libnghttp2-1.33.0-1.1.6.amzn1.x86_64 libpsl-0.6.2-1.2.amzn1.x86_64 libselinux-2.1.10-3.22.amzn1.x86_64 libsepol-2.1.7-3.12.amzn1.x86_64 @@ -46,8 +46,8 @@ libstdc++72-7.2.1-2.59.amzn1.x86_64 libtasn1-2.3-6.6.amzn1.x86_64 libunistring-0.9.3-6.1.amzn1.x86_64 libverto-0.2.5-4.9.amzn1.x86_64 -libxml2-2.9.1-6.3.52.amzn1.x86_64 -libxml2-python27-2.9.1-6.3.52.amzn1.x86_64 +libxml2-2.9.1-6.4.40.amzn1.x86_64 +libxml2-python27-2.9.1-6.4.40.amzn1.x86_64 lua-5.1.4-4.1.9.amzn1.x86_64 make-3.82-21.10.amzn1.x86_64 ncurses-5.7-4.20090207.14.amzn1.x86_64 @@ -70,21 +70,21 @@ pinentry-0.7.6-6.11.amzn1.x86_64 pkgconfig-0.27.1-2.7.amzn1.x86_64 popt-1.13-7.7.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.18-1.137.amzn1.x86_64 +python27-2.7.18-2.139.amzn1.x86_64 python27-chardet-2.0.1-7.7.amzn1.noarch python27-iniparse-0.3.1-2.1.9.amzn1.noarch python27-kitchen-1.1.1-5.6.amzn1.noarch -python27-libs-2.7.18-1.137.amzn1.x86_64 +python27-libs-2.7.18-2.139.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 python27-pyxattr-0.5.0-1.6.amzn1.x86_64 python27-urlgrabber-3.10-8.16.amzn1.noarch readline-6.2-9.14.amzn1.x86_64 -rpm-4.11.3-40.76.amzn1.x86_64 -rpm-build-libs-4.11.3-40.76.amzn1.x86_64 -rpm-libs-4.11.3-40.76.amzn1.x86_64 -rpm-python27-4.11.3-40.76.amzn1.x86_64 +rpm-4.11.3-40.77.amzn1.x86_64 +rpm-build-libs-4.11.3-40.77.amzn1.x86_64 +rpm-libs-4.11.3-40.77.amzn1.x86_64 +rpm-python27-4.11.3-40.77.amzn1.x86_64 sed-4.2.1-10.10.amzn1.x86_64 setup-2.8.14-20.12.amzn1.noarch shared-mime-info-1.1-9.8.amzn1.x86_64 diff --git a/base/base-2/amazonlinux2.txt b/base/base-2/amazonlinux2.txt index b6f2420b..ac90985e 100644 --- a/base/base-2/amazonlinux2.txt +++ b/base/base-2/amazonlinux2.txt @@ -1,26 +1,26 @@ -amazon-linux-extras-1.6.11-1.amzn2.noarch +amazon-linux-extras-1.6.12-1.amzn2.noarch basesystem-10.0-7.amzn2.0.1.noarch bash-4.2.46-33.amzn2.x86_64 bzip2-libs-1.0.6-13.amzn2.0.2.x86_64 -ca-certificates-2019.2.32-76.amzn2.0.2.noarch +ca-certificates-2019.2.32-76.amzn2.0.3.noarch chkconfig-1.7.4-1.amzn2.0.2.x86_64 coreutils-8.22-24.amzn2.x86_64 cpio-2.11-27.amzn2.x86_64 -curl-7.61.1-12.amzn2.0.1.x86_64 +curl-7.61.1-12.amzn2.0.2.x86_64 cyrus-sasl-lib-2.1.26-23.amzn2.x86_64 diffutils-3.3-5.amzn2.x86_64 elfutils-libelf-0.176-2.amzn2.x86_64 expat-2.1.0-10.amzn2.0.2.x86_64 -file-libs-5.11-35.amzn2.0.2.x86_64 +file-libs-5.11-36.amzn2.0.1.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 findutils-4.5.11-6.amzn2.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 gdbm-1.13-6.amzn2.0.2.x86_64 glib2-2.56.1-5.amzn2.0.1.x86_64 -glibc-2.26-34.amzn2.x86_64 -glibc-common-2.26-34.amzn2.x86_64 -glibc-langpack-en-2.26-34.amzn2.x86_64 -glibc-minimal-langpack-2.26-34.amzn2.x86_64 +glibc-2.26-35.amzn2.x86_64 +glibc-common-2.26-35.amzn2.x86_64 +glibc-langpack-en-2.26-35.amzn2.x86_64 +glibc-minimal-langpack-2.26-35.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 gnupg2-2.0.22-5.amzn2.0.4.x86_64 gpgme-1.3.2-5.amzn2.0.2.x86_64 @@ -34,27 +34,27 @@ libattr-2.4.46-12.amzn2.0.2.x86_64 libblkid-2.30.2-2.amzn2.0.4.x86_64 libcap-2.22-9.amzn2.0.2.x86_64 libcom_err-1.42.9-12.amzn2.0.2.x86_64 -libcrypt-2.26-34.amzn2.x86_64 -libcurl-7.61.1-12.amzn2.0.1.x86_64 +libcrypt-2.26-35.amzn2.x86_64 +libcurl-7.61.1-12.amzn2.0.2.x86_64 libdb-5.3.21-24.amzn2.0.3.x86_64 libdb-utils-5.3.21-24.amzn2.0.3.x86_64 libffi-3.0.13-18.amzn2.0.2.x86_64 -libgcc-7.3.1-6.amzn2.0.4.x86_64 +libgcc-7.3.1-9.amzn2.x86_64 libgcrypt-1.5.3-14.amzn2.0.2.x86_64 libgpg-error-1.12-3.amzn2.0.3.x86_64 libidn2-2.3.0-1.amzn2.x86_64 libmetalink-0.1.2-7.amzn2.0.2.x86_64 libmount-2.30.2-2.amzn2.0.4.x86_64 -libnghttp2-1.39.2-1.amzn2.x86_64 +libnghttp2-1.41.0-1.amzn2.x86_64 libselinux-2.5-12.amzn2.0.2.x86_64 libsepol-2.5-8.1.amzn2.0.2.x86_64 libssh2-1.4.3-12.amzn2.2.2.x86_64 -libstdc++-7.3.1-6.amzn2.0.4.x86_64 +libstdc++-7.3.1-9.amzn2.x86_64 libtasn1-4.10-1.amzn2.0.2.x86_64 libunistring-0.9.3-9.amzn2.0.2.x86_64 libuuid-2.30.2-2.amzn2.0.4.x86_64 libverto-0.2.5-4.amzn2.0.2.x86_64 -libxml2-2.9.1-6.amzn2.3.3.x86_64 +libxml2-2.9.1-6.amzn2.4.1.x86_64 lua-5.1.4-15.amzn2.0.2.x86_64 ncurses-6.0-8.20170212.amzn2.1.3.x86_64 ncurses-base-6.0-8.20170212.amzn2.1.3.noarch @@ -69,17 +69,17 @@ nss-tools-3.44.0-7.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 openldap-2.4.44-15.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 -p11-kit-0.23.5-3.amzn2.0.2.x86_64 -p11-kit-trust-0.23.5-3.amzn2.0.2.x86_64 +p11-kit-0.23.19-1.amzn2.x86_64 +p11-kit-trust-0.23.19-1.amzn2.x86_64 pcre-8.32-17.amzn2.0.2.x86_64 pinentry-0.8.1-17.amzn2.0.2.x86_64 popt-1.13-16.amzn2.0.2.x86_64 pth-2.0.7-23.amzn2.0.2.x86_64 pygpgme-0.3-9.amzn2.0.2.x86_64 pyliblzma-0.5.3-11.amzn2.0.2.x86_64 -python-2.7.18-1.amzn2.x86_64 +python-2.7.18-1.amzn2.0.2.x86_64 python-iniparse-0.4-9.amzn2.noarch -python-libs-2.7.18-1.amzn2.x86_64 +python-libs-2.7.18-1.amzn2.0.2.x86_64 python-pycurl-7.19.0-19.amzn2.0.2.x86_64 python-urlgrabber-3.10-9.amzn2.0.1.noarch python2-rpm-4.11.3-40.amzn2.0.4.x86_64 @@ -92,8 +92,8 @@ sed-4.2.2-5.amzn2.0.2.x86_64 setup-2.8.71-10.amzn2.0.1.noarch shared-mime-info-1.8-4.amzn2.x86_64 sqlite-3.7.17-8.amzn2.1.1.x86_64 -system-release-2-11.amzn2.x86_64 -tzdata-2019c-1.amzn2.noarch +system-release-2-12.amzn2.x86_64 +tzdata-2020a-1.amzn2.noarch vim-minimal-8.1.1602-1.amzn2.x86_64 xz-libs-5.2.2-1.amzn2.0.2.x86_64 yum-3.4.3-158.amzn2.0.4.noarch diff --git a/base/base-2/packages.txt b/base/base-2/packages.txt index 7c3c164e..18018541 100644 --- a/base/base-2/packages.txt +++ b/base/base-2/packages.txt @@ -1,14 +1,14 @@ basesystem-10.0-7.amzn2.0.1.noarch bash-4.2.46-33.amzn2.x86_64 -ca-certificates-2019.2.32-76.amzn2.0.2.noarch +ca-certificates-2019.2.32-76.amzn2.0.3.noarch chkconfig-1.7.4-1.amzn2.0.2.x86_64 coreutils-8.22-24.amzn2.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 -glibc-2.26-34.amzn2.x86_64 -glibc-all-langpacks-2.26-34.amzn2.x86_64 -glibc-common-2.26-34.amzn2.x86_64 -glibc-minimal-langpack-2.26-34.amzn2.x86_64 +glibc-2.26-35.amzn2.x86_64 +glibc-all-langpacks-2.26-35.amzn2.x86_64 +glibc-common-2.26-35.amzn2.x86_64 +glibc-minimal-langpack-2.26-35.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 grep-2.20-3.amzn2.0.2.x86_64 info-5.1-5.amzn2.x86_64 @@ -19,11 +19,11 @@ libattr-2.4.46-12.amzn2.0.2.x86_64 libcap-2.22-9.amzn2.0.2.x86_64 libcom_err-1.42.9-12.amzn2.0.2.x86_64 libffi-3.0.13-18.amzn2.0.2.x86_64 -libgcc-7.3.1-6.amzn2.0.4.x86_64 +libgcc-7.3.1-9.amzn2.x86_64 libicu-50.2-4.amzn2.x86_64 libselinux-2.5-12.amzn2.0.2.x86_64 libsepol-2.5-8.1.amzn2.0.2.x86_64 -libstdc++-7.3.1-6.amzn2.0.4.x86_64 +libstdc++-7.3.1-9.amzn2.x86_64 libtasn1-4.10-1.amzn2.0.2.x86_64 libverto-0.2.5-4.amzn2.0.2.x86_64 ncurses-6.0-8.20170212.amzn2.1.3.x86_64 @@ -33,12 +33,12 @@ nspr-4.21.0-1.amzn2.0.2.x86_64 nss-softokn-freebl-3.44.0-8.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 -p11-kit-0.23.5-3.amzn2.0.2.x86_64 -p11-kit-trust-0.23.5-3.amzn2.0.2.x86_64 +p11-kit-0.23.19-1.amzn2.x86_64 +p11-kit-trust-0.23.19-1.amzn2.x86_64 pcre-8.32-17.amzn2.0.2.x86_64 popt-1.13-16.amzn2.0.2.x86_64 sed-4.2.2-5.amzn2.0.2.x86_64 setup-2.8.71-10.amzn2.0.1.noarch -system-release-2-11.amzn2.x86_64 -tzdata-2019c-1.amzn2.noarch +system-release-2-12.amzn2.x86_64 +tzdata-2020a-1.amzn2.noarch zlib-1.2.7-18.amzn2.x86_64 diff --git a/base/packages.txt b/base/packages.txt index a4d5ef92..b1cd85be 100644 --- a/base/packages.txt +++ b/base/packages.txt @@ -1,14 +1,14 @@ -ImageMagick-6.7.8.9-15.21.amzn1.x86_64 +ImageMagick-6.9.10.68-3.22.amzn1.x86_64 alsa-lib-1.0.22-3.9.amzn1.x86_64 audit-libs-2.6.5-3.28.amzn1.x86_64 avahi-libs-0.6.25-12.17.amzn1.x86_64 basesystem-10.0-4.9.amzn1.noarch -bash-4.2.46-28.37.amzn1.x86_64 +bash-4.2.46-34.43.amzn1.x86_64 binutils-2.25.1-31.base.66.amzn1.x86_64 bzip2-1.0.6-8.12.amzn1.x86_64 bzip2-libs-1.0.6-8.12.amzn1.x86_64 ca-certificates-2018.2.22-65.1.22.amzn1.noarch -cairo-1.12.14-6.8.amzn1.x86_64 +cairo-1.12.14-6.9.amzn1.x86_64 chkconfig-1.3.49.3-2.14.amzn1.x86_64 compat-gmp4-4.3.2-1.14.amzn1.x86_64 copy-jdk-configs-3.3-10.3.amzn1.noarch @@ -17,7 +17,7 @@ cpio-2.10-12.12.amzn1.x86_64 cracklib-2.8.16-4.14.amzn1.x86_64 cracklib-dicts-2.8.16-4.14.amzn1.x86_64 cups-libs-1.4.2-67.21.amzn1.x86_64 -curl-7.61.1-12.93.amzn1.x86_64 +curl-7.61.1-12.94.amzn1.x86_64 cyrus-sasl-lib-2.1.23-13.16.amzn1.x86_64 db4-4.7.25-18.11.amzn1.x86_64 db4-utils-4.7.25-18.11.amzn1.x86_64 @@ -84,7 +84,7 @@ libblkid-2.23.2-59.29.amzn1.x86_64 libcap-2.16-5.5.8.amzn1.x86_64 libcap-ng-0.7.5-4.15.amzn1.x86_64 libcom_err-1.43.5-2.43.amzn1.x86_64 -libcurl-7.61.1-12.93.amzn1.x86_64 +libcurl-7.61.1-12.94.amzn1.x86_64 libdrm-2.4.82-1.14.amzn1.x86_64 libffi-3.0.13-16.5.amzn1.x86_64 libfontenc-1.0.5-2.6.amzn1.x86_64 @@ -98,7 +98,7 @@ libicu-50.2-4.0.amzn1.x86_64 libidn2-2.3.0-1.4.amzn1.x86_64 libjpeg-turbo-1.2.90-8.16.amzn1.x86_64 libmount-2.23.2-59.29.amzn1.x86_64 -libnghttp2-1.31.1-2.5.amzn1.x86_64 +libnghttp2-1.33.0-1.1.6.amzn1.x86_64 libpciaccess-0.13.1-4.1.11.amzn1.x86_64 libpng-1.2.49-2.14.amzn1.x86_64 libpsl-0.6.2-1.2.amzn1.x86_64 @@ -119,7 +119,7 @@ libuuid-2.23.2-59.29.amzn1.x86_64 libverto-0.2.5-4.9.amzn1.x86_64 libwmf-lite-0.2.8.4-41.13.amzn1.x86_64 libxcb-1.11-2.21.amzn1.x86_64 -libxml2-2.9.1-6.3.52.amzn1.x86_64 +libxml2-2.9.1-6.4.40.amzn1.x86_64 libxshmfence-1.2-1.4.amzn1.x86_64 libxslt-1.1.28-5.13.amzn1.x86_64 lksctp-tools-1.0.10-7.7.amzn1.x86_64 @@ -181,23 +181,23 @@ popt-1.13-7.7.amzn1.x86_64 procps-3.2.8-45.16.amzn1.x86_64 psmisc-22.20-8.12.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.18-1.137.amzn1.x86_64 +python27-2.7.18-1.138.amzn1.x86_64 python27-iniparse-0.3.1-2.1.9.amzn1.noarch -python27-libs-2.7.18-1.137.amzn1.x86_64 +python27-libs-2.7.18-1.138.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 python27-pyxattr-0.5.0-1.6.amzn1.x86_64 python27-urlgrabber-3.10-8.16.amzn1.noarch -python36-3.6.10-1.16.amzn1.x86_64 -python36-libs-3.6.10-1.16.amzn1.x86_64 +python36-3.6.11-1.17.amzn1.x86_64 +python36-libs-3.6.11-1.17.amzn1.x86_64 python36-pip-9.0.3-1.27.amzn1.noarch python36-setuptools-36.2.7-1.33.amzn1.noarch readline-6.2-9.14.amzn1.x86_64 -rpm-4.11.3-40.76.amzn1.x86_64 -rpm-build-libs-4.11.3-40.76.amzn1.x86_64 -rpm-libs-4.11.3-40.76.amzn1.x86_64 -rpm-python27-4.11.3-40.76.amzn1.x86_64 +rpm-4.11.3-40.77.amzn1.x86_64 +rpm-build-libs-4.11.3-40.77.amzn1.x86_64 +rpm-libs-4.11.3-40.77.amzn1.x86_64 +rpm-python27-4.11.3-40.77.amzn1.x86_64 sed-4.2.1-10.10.amzn1.x86_64 setup-2.8.14-20.12.amzn1.noarch shadow-utils-4.1.4.2-13.10.amzn1.x86_64 From 8ae26020ab7de9faad750a9e11f779b8b605fa7e Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 23 Sep 2020 08:32:52 -0400 Subject: [PATCH 46/83] Bump aws-sam-cli to 1.3.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- .../run/MockBootstraps/lib/Bootstrap.dll | Bin 147968 -> 147968 bytes .../run/MockBootstraps/lib/Bootstrap.pdb | Bin 45932 -> 45932 bytes dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 21 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 7972fb81..eaf95a1e 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -26,6 +26,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index e5201f3f..e5bd0c8b 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -27,7 +27,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 && \ + pipx install aws-sam-cli==1.3.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.dll index 2adc509b9298cd3e15d84431b050b26ebc7b59de..0711afac7c936960e201a819b464bfa557ba87bd 100644 GIT binary patch delta 114 zcmZo@;cRH(oY29dW;gX{W6#zeMvF%RPuZJZO5{a&ZTn__(;vFXsyH=c@Yq1&%KVoV5ODQY=z zYr2IwQ-FZ`ytU1Lr2^g7y!#k_bh_H3=`+lkG8Ler*L0wwK=o0t?&ob`&Y!;M@3)^e L+Z8RC?sEbFO@cUp diff --git a/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb b/dotnetcore2.1/run/MockBootstraps/lib/Bootstrap.pdb index 4513532ae742c9fd3185a8e1f3beda602f728f5a..ddc2c4d463f967e8be6d2c0abf31c5ea110e3a2c 100644 GIT binary patch delta 77 zcmV-T0J8t=<^t^I0+4(ZW_ZoC=%$fGpvxbWI2-v|WKp5`v5>o_Ci47yy%4!(Hyv4D j(eLE^)mlwbNqS72Oa(w^LHJ(I8X{N#03|51ai{wWJMty& delta 77 zcmV-T0J8t=<^t^I0+4(ZN1m;N{Tfk5tnTqw#g``Ha)iLzv5>o_CfkYW5fQ27(TQ`~ jV3R9PBC2)ye9M$0S-18b_~l^COd?nS03{K#ai{wWc`+z# diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 2f230a03..0d8f414c 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -22,7 +22,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 && \ + pipx install aws-sam-cli==1.3.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index fe38995c..403ab19b 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -20,6 +20,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index ec6170d3..a1cdcf83 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -16,4 +16,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 622dd0b4..9ee02be0 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -19,4 +19,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 28880ad8..536818ec 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -19,4 +19,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index ec77907b..571e7a8f 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 13e3d46f..8213ebb0 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 84584a60..b7ddf5f3 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 426be790..09339351 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 27ce85a2..a41a8f8b 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 78a57c0f..0563fd82 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -3,4 +3,4 @@ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index a965582a..a8344e09 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -5,4 +5,4 @@ FROM lambci/lambda-base:build RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index cb8fecce..4689d728 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -26,4 +26,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index ad5f9da9..664e0a7d 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index ea9be052..c0d233ad 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 + pipx install aws-sam-cli==1.3.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 24629792..366eac1c 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -16,6 +16,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 && \ + pipx install aws-sam-cli==1.3.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 3fa80f40..52e12d6c 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.2.0 && \ + pipx install aws-sam-cli==1.3.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 247933cd92e389f4f96de5466b9adb1a6d45f82f Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 23 Sep 2020 08:35:50 -0400 Subject: [PATCH 47/83] Remove date-tagged after publishing --- base/publish-all.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/base/publish-all.sh b/base/publish-all.sh index da170994..aa86df18 100755 --- a/base/publish-all.sh +++ b/base/publish-all.sh @@ -19,6 +19,7 @@ for RUNTIME in $RUNTIMES; do docker tag lambci/lambda:${RUNTIME} lambci/lambda:${PUBLISH_DATE}-${RUNTIME} docker push lambci/lambda:${RUNTIME} docker push lambci/lambda:${PUBLISH_DATE}-${RUNTIME} + docker rmi lambci/lambda:${PUBLISH_DATE}-${RUNTIME} done docker push lambci/lambda-base:build From 039ef1f767e2b1c0b443376c297ed71efca0f561 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 24 Sep 2020 19:50:39 -0400 Subject: [PATCH 48/83] Bump aws-sam-cli to 1.3.2 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index eaf95a1e..d8c9a82d 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -26,6 +26,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index e5bd0c8b..61104698 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -27,7 +27,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 && \ + pipx install aws-sam-cli==1.3.2 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 0d8f414c..feca3f3a 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -22,7 +22,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 && \ + pipx install aws-sam-cli==1.3.2 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 403ab19b..2fbd81a4 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -20,6 +20,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index a1cdcf83..8c6ad828 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -16,4 +16,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 9ee02be0..0efa5e52 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -19,4 +19,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 536818ec..48b9d0d7 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -19,4 +19,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 571e7a8f..2bc015fa 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 8213ebb0..f97ad5aa 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -11,4 +11,4 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index b7ddf5f3..e6266985 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 09339351..dc294953 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index a41a8f8b..e3d41085 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 0563fd82..718bd174 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -3,4 +3,4 @@ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index a8344e09..b2f29e2b 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -5,4 +5,4 @@ FROM lambci/lambda-base:build RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 4689d728..88b30e62 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -26,4 +26,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 664e0a7d..8d72e0fa 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index c0d233ad..bdc2a938 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,4 +18,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.0.10 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 + pipx install aws-sam-cli==1.3.2 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 366eac1c..537d678f 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -16,6 +16,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 && \ + pipx install aws-sam-cli==1.3.2 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 52e12d6c..1dfb7fc1 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -14,6 +14,6 @@ RUN rm -rf /var/runtime /var/lang /var/rapid && \ # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.0 && \ + pipx install aws-sam-cli==1.3.2 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From f16b40a3207ae9eab8d7c6459532f323882ce996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= Date: Thu, 1 Oct 2020 09:23:29 -0400 Subject: [PATCH 49/83] Add Github Actions build (#309) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Gábor Lipták --- .github/workflows/ci-build.yml | 20 ++++++++++++++++++++ .github/workflows/ci-run.yml | 20 ++++++++++++++++++++ base/build-all-build.sh | 14 ++++++++++++++ base/build-all-run.sh | 16 ++++++++++++++++ base/build-all.sh | 23 +++-------------------- 5 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/ci-build.yml create mode 100644 .github/workflows/ci-run.yml create mode 100755 base/build-all-build.sh create mode 100755 base/build-all-run.sh diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml new file mode 100644 index 00000000..801ac7c5 --- /dev/null +++ b/.github/workflows/ci-build.yml @@ -0,0 +1,20 @@ +name: ci-build + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Build build Docker images + working-directory: base + run: ./build-all-build.sh + - name: List Docker images + run: | + docker images diff --git a/.github/workflows/ci-run.yml b/.github/workflows/ci-run.yml new file mode 100644 index 00000000..880bb7df --- /dev/null +++ b/.github/workflows/ci-run.yml @@ -0,0 +1,20 @@ +name: ci-run + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Build run Docker images + working-directory: base + run: ./build-all-run.sh + - name: List Docker images + run: | + docker images diff --git a/base/build-all-build.sh b/base/build-all-build.sh new file mode 100755 index 00000000..29f2f25d --- /dev/null +++ b/base/build-all-build.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -e + +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" + +TOP_DIR="${PWD}/.." + +for RUNTIME in $RUNTIMES; do + echo build-${RUNTIME} + + cd ${TOP_DIR}/${RUNTIME}/build + + docker build -t lambci/lambda:build-${RUNTIME} . +done diff --git a/base/build-all-run.sh b/base/build-all-run.sh new file mode 100755 index 00000000..0e7ebe4c --- /dev/null +++ b/base/build-all-run.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -e + +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" + +TOP_DIR="${PWD}/.." + +for RUNTIME in $RUNTIMES; do + echo $RUNTIME + + cd ${TOP_DIR}/${RUNTIME}/run + + [ -x ./update_libs.sh ] && ./update_libs.sh + + docker build --no-cache -t lambci/lambda:${RUNTIME} . +done diff --git a/base/build-all.sh b/base/build-all.sh index 9a0e6e31..aeb952d8 100755 --- a/base/build-all.sh +++ b/base/build-all.sh @@ -1,23 +1,6 @@ #!/bin/bash +set -e -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +${PWD}/build-all-run.sh -TOP_DIR="${PWD}/.." - -for RUNTIME in $RUNTIMES; do - echo $RUNTIME - - cd ${TOP_DIR}/${RUNTIME}/run - - [ -x ./update_libs.sh ] && ./update_libs.sh - - docker build --no-cache -t lambci/lambda:${RUNTIME} . -done - -for RUNTIME in $RUNTIMES; do - echo build-${RUNTIME} - - cd ${TOP_DIR}/${RUNTIME}/build - - docker build -t lambci/lambda:build-${RUNTIME} . -done +${PWD}/build-all-build.sh From c7b359eef2f54a640d925a92202e8860bd41a60e Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 1 Oct 2020 09:42:00 -0400 Subject: [PATCH 50/83] Split runtimes out into separate script --- base/build-all-build.sh | 2 +- base/build-all-run.sh | 2 +- base/dump.sh | 2 +- base/publish-all.sh | 2 +- base/runtimes.sh | 2 ++ base/tag-all.sh | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 base/runtimes.sh diff --git a/base/build-all-build.sh b/base/build-all-build.sh index 29f2f25d..d5b958be 100755 --- a/base/build-all-build.sh +++ b/base/build-all-build.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +source ${PWD}/runtimes.sh TOP_DIR="${PWD}/.." diff --git a/base/build-all-run.sh b/base/build-all-run.sh index 0e7ebe4c..27abcaab 100755 --- a/base/build-all-run.sh +++ b/base/build-all-run.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +source ${PWD}/runtimes.sh TOP_DIR="${PWD}/.." diff --git a/base/dump.sh b/base/dump.sh index 608e2bae..944988d2 100755 --- a/base/dump.sh +++ b/base/dump.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="node43 node610 node810 node10x node12x python27 python36 python37 python38 ruby25 ruby27 java8 java11 go1x dotnetcore20 dotnetcore21 dotnetcore31 provided" +source ${PWD}/runtimes.sh for RUNTIME in $RUNTIMES; do echo $RUNTIME diff --git a/base/publish-all.sh b/base/publish-all.sh index aa86df18..a2fb0c2b 100755 --- a/base/publish-all.sh +++ b/base/publish-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +source ${PWD}/runtimes.sh echo -n "Enter repository passphrase: " read -s DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE diff --git a/base/runtimes.sh b/base/runtimes.sh new file mode 100644 index 00000000..22080f09 --- /dev/null +++ b/base/runtimes.sh @@ -0,0 +1,2 @@ +# RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +RUNTIMES="nodejs12.x" diff --git a/base/tag-all.sh b/base/tag-all.sh index 0591bf34..a8314ee9 100755 --- a/base/tag-all.sh +++ b/base/tag-all.sh @@ -1,6 +1,6 @@ #!/bin/bash -RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" +source ${PWD}/runtimes.sh git tag -f latest From 2d566e44b5313882239c36fa792681e795092df9 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 1 Oct 2020 09:43:08 -0400 Subject: [PATCH 51/83] Update poetry to 1.1.0 --- python2.7/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index ed8e9abe..5a6fcc01 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -8,7 +8,7 @@ RUN rm -rf /var/runtime /var/lang && \ # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.0.10/get-poetry.py | POETRY_VERSION=1.0.10 python && \ + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.0/get-poetry.py | POETRY_VERSION=1.1.0 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 88b30e62..4937e57d 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -23,7 +23,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.0.10 && \ + pipx install poetry==1.1.0 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.3.2 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 8d72e0fa..c0d6a654 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -15,7 +15,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.0.10 && \ + pipx install poetry==1.1.0 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.3.2 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index bdc2a938..3109232b 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -15,7 +15,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.0.10 && \ + pipx install poetry==1.1.0 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.3.2 From 0bd3ee1e69a9f3f8263fd43b55204aea31b1dce5 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 1 Oct 2020 10:08:50 -0400 Subject: [PATCH 52/83] Make all build images usr /var dirs from runtime images --- base/runtimes.sh | 3 +-- dotnetcore2.0/build/Dockerfile | 10 +++++++--- dotnetcore2.1/build/Dockerfile | 12 ++++++++---- dotnetcore3.1/build/Dockerfile | 12 ++++++++---- go1.x/build/Dockerfile | 10 +++++++--- java11/build/Dockerfile | 10 +++++++--- java8.al2/build/Dockerfile | 14 +++++++++----- java8/build/Dockerfile | 10 +++++++--- nodejs10.x/build/Dockerfile | 7 +++++-- nodejs12.x/build/Dockerfile | 7 +++++-- nodejs4.3/build/Dockerfile | 7 +++++-- nodejs6.10/build/Dockerfile | 7 +++++-- nodejs8.10/build/Dockerfile | 7 +++++-- provided.al2/build/Dockerfile | 8 +++++++- provided/build/Dockerfile | 6 ++++++ python2.7/build/Dockerfile | 7 +++++-- python3.6/build/Dockerfile | 10 +++++++--- python3.7/build/Dockerfile | 7 +++++-- python3.8/build/Dockerfile | 7 +++++-- ruby2.5/build/Dockerfile | 7 +++++-- ruby2.7/build/Dockerfile | 7 +++++-- 21 files changed, 124 insertions(+), 51 deletions(-) diff --git a/base/runtimes.sh b/base/runtimes.sh index 22080f09..80891dd4 100644 --- a/base/runtimes.sh +++ b/base/runtimes.sh @@ -1,2 +1 @@ -# RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" -RUNTIMES="nodejs12.x" +RUNTIMES="provided go1.x nodejs4.3 nodejs6.10 nodejs8.10 python2.7 python3.6 python3.7 ruby2.5 java8 dotnetcore2.0 dotnetcore2.1 provided.al2 nodejs10.x nodejs12.x python3.8 ruby2.7 java8.al2 java11 dotnetcore3.1" diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index d8c9a82d..ddedc900 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:dotnetcore2.0 + FROM lambci/lambda-base:build # Run: docker run --rm --entrypoint dotnet lambci/lambda:dotnetcore2.1 --info @@ -9,9 +11,11 @@ ENV PATH=/var/lang/bin:$PATH \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/dotnetcore2.0.tgz | tar -zx -C / && \ - yum install -y libunwind && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN yum install -y libunwind && \ curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VERSION -i /var/lang/bin && \ mkdir /tmp/warmup && \ cd /tmp/warmup && \ diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 61104698..d2e568e9 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -1,4 +1,6 @@ -FROM lambci/lambda-base:build +FROM lambci/lambda:dotnetcore2.1 + +FROM lambci/lambda-base:build # Run: docker run --rm --entrypoint dotnet lambci/lambda:dotnetcore2.1 --info # Check https://dotnet.microsoft.com/download/dotnet-core/2.1 for versions @@ -10,9 +12,11 @@ ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/dotnetcore2.1.tgz | tar -zx -C / && \ - yum install -y libunwind && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN yum install -y libunwind && \ curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VERSION -i $DOTNET_ROOT && \ mkdir /tmp/warmup && \ cd /tmp/warmup && \ diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index feca3f3a..c585ba0a 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -1,4 +1,6 @@ -FROM lambci/lambda-base-2:build +FROM lambci/lambda:dotnetcore3.1 + +FROM lambci/lambda-base-2:build # Run: docker run --rm --entrypoint dotnet lambci/lambda:dotnetcore3.1 --info # Check https://dotnet.microsoft.com/download/dotnet-core/3.1 for versions @@ -10,9 +12,11 @@ ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/dotnetcore3.1.tgz | tar -zx -C / && \ - curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VERSION -i $DOTNET_ROOT && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VERSION -i $DOTNET_ROOT && \ mkdir /tmp/warmup && \ cd /tmp/warmup && \ dotnet new && \ diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 2fbd81a4..0c5a0205 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:go1.x + FROM lambci/lambda-base:build # https://golang.org/doc/devel/release.html @@ -8,9 +10,11 @@ ENV GOLANG_VERSION=1.15 \ WORKDIR /go/src/handler -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/go1.x.tgz | tar -zx -C / && \ - curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz | tar -zx -C /usr/local && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz | tar -zx -C /usr/local && \ go get github.com/golang/dep/cmd/dep && \ go install github.com/golang/dep/cmd/dep && \ go get golang.org/x/vgo diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 8c6ad828..d29cb706 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -1,12 +1,16 @@ +FROM lambci/lambda:java11 + FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_java11 -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/java11.tgz | tar -zx -C / && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 0efa5e52..fa4732a0 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -1,13 +1,17 @@ -FROM lambci/lambda-base-2:build +FROM lambci/lambda:java8.al2 + +FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_rapid -RUN rm -rf /var/runtime && \ - curl https://lambci.s3.amazonaws.com/fs/java8.al2.tgz | tar -zx -C / && \ - rm -rf /var/lang/* && \ - curl -sSL https://corretto.aws/downloads/resources/8.252.09.1/amazon-corretto-8.252.09.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN rm -rf /var/lang/* && \ + curl -sSL https://corretto.aws/downloads/resources/8.265.01.1/amazon-corretto-8.265.01.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ rm -rf /var/lang/*.zip && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 48b9d0d7..d64f8e68 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -1,12 +1,16 @@ +FROM lambci/lambda:java8 + FROM lambci/lambda-base:build ENV AWS_EXECUTION_ENV=AWS_Lambda_java8 WORKDIR / -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/java8.tgz | tar -zx -C / && \ - yum install -y java-1.8.0-openjdk-devel && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN yum install -y java-1.8.0-openjdk-devel && \ mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 2bc015fa..3c533df0 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:nodejs10.x + FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ @@ -5,8 +7,9 @@ ENV PATH=/var/lang/bin:$PATH \ AWS_EXECUTION_ENV=AWS_Lambda_nodejs10.x \ NODE_PATH=/opt/nodejs/node10/node_modules:/opt/nodejs/node_modules:/var/runtime/node_modules -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/nodejs10.x.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index f97ad5aa..1cc57ffc 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:nodejs12.x + FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ @@ -5,8 +7,9 @@ ENV PATH=/var/lang/bin:$PATH \ AWS_EXECUTION_ENV=AWS_Lambda_nodejs12.x \ NODE_PATH=/opt/nodejs/node12/node_modules:/opt/nodejs/node_modules:/var/runtime/node_modules -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/nodejs12.x.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index e6266985..becdd201 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:nodejs4.3 + FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ @@ -6,8 +8,9 @@ ENV PATH=/var/lang/bin:$PATH \ NODE_PATH=/var/runtime:/var/task:/var/runtime/node_modules \ npm_config_unsafe-perm=true -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/nodejs4.3.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index dc294953..e3e0f5f0 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:nodejs6.10 + FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ @@ -6,8 +8,9 @@ ENV PATH=/var/lang/bin:$PATH \ NODE_PATH=/opt/nodejs/node6/node_modules:/opt/nodejs/node_modules:/var/runtime/node_modules:/var/runtime:/var/task:/var/runtime/node_modules \ npm_config_unsafe-perm=true -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/nodejs6.10.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index e3d41085..790a2b1b 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:nodejs8.10 + FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ @@ -6,8 +8,9 @@ ENV PATH=/var/lang/bin:$PATH \ NODE_PATH=/opt/nodejs/node8/node_modules:/opt/nodejs/node_modules:/var/runtime/node_modules:/var/runtime:/var/task:/var/runtime/node_modules \ npm_config_unsafe-perm=true -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/nodejs8.10.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 718bd174..128daae4 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -1,4 +1,10 @@ -FROM lambci/lambda-base-2:build +FROM lambci/lambda:provided.al2 + +FROM lambci/lambda-base-2:build + +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index b2f29e2b..928c7ea5 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -1,5 +1,11 @@ +FROM lambci/lambda:provided + FROM lambci/lambda-base:build +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index 5a6fcc01..97facea9 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -1,9 +1,12 @@ +FROM lambci/lambda:python2.7 + FROM lambci/lambda-base:build ENV AWS_EXECUTION_ENV=AWS_Lambda_python2.7 -RUN rm -rf /var/runtime /var/lang && \ - curl https://lambci.s3.amazonaws.com/fs/python2.7.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 4937e57d..1d078d19 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:python3.6 + FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ @@ -7,9 +9,11 @@ ENV PATH=/var/lang/bin:$PATH \ PIPX_BIN_DIR=/var/lang/bin \ PIPX_HOME=/var/lang/pipx -RUN rm -rf /var/runtime /var/lang && \ - export PYTHON_VERSION=3.6.10 && \ - curl https://lambci.s3.amazonaws.com/fs/python3.6.tgz | tar -xz -C / && \ +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid + +RUN export PYTHON_VERSION=3.6.12 && \ sed -i '/^prefix=/c\prefix=/var/lang' /var/lang/lib/pkgconfig/python-3.6.pc && \ curl https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz | tar -xJ && \ cd Python-${PYTHON_VERSION} && \ diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index c0d6a654..ac502307 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:python3.7 + FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ @@ -7,8 +9,9 @@ ENV PATH=/var/lang/bin:$PATH \ PIPX_BIN_DIR=/var/lang/bin \ PIPX_HOME=/var/lang/pipx -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/python3.7.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 3109232b..1c40d5d4 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:python3.8 + FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ @@ -7,8 +9,9 @@ ENV PATH=/var/lang/bin:$PATH \ PIPX_BIN_DIR=/var/lang/bin \ PIPX_HOME=/var/lang/pipx -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/python3.8.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pip install -U pip setuptools wheel --no-cache-dir && \ diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 537d678f..d9264d13 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:ruby2.5 + FROM lambci/lambda-base:build ENV PATH=/var/lang/bin:$PATH \ @@ -8,8 +10,9 @@ ENV PATH=/var/lang/bin:$PATH \ RUBYLIB=/var/task:/var/runtime/lib:/opt/ruby/lib \ BUNDLE_SILENCE_ROOT_WARNING=1 -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/ruby2.5.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 1dfb7fc1..4cd46196 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -1,3 +1,5 @@ +FROM lambci/lambda:ruby2.7 + FROM lambci/lambda-base-2:build ENV PATH=/var/lang/bin:$PATH \ @@ -8,8 +10,9 @@ ENV PATH=/var/lang/bin:$PATH \ RUBYLIB=/var/task:/var/runtime/lib:/opt/ruby/lib \ BUNDLE_SILENCE_ROOT_WARNING=1 -RUN rm -rf /var/runtime /var/lang /var/rapid && \ - curl https://lambci.s3.amazonaws.com/fs/ruby2.7.tgz | tar -zx -C / +COPY --from=0 /var/runtime /var/runtime +COPY --from=0 /var/lang /var/lang +COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ From ba16412c29548f9bafc0faa8c97f5d3b49d7dc41 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sun, 4 Oct 2020 11:40:08 -0400 Subject: [PATCH 53/83] Update aws-sam-cli to 1.4.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index ddedc900..fbeed971 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index d2e568e9..e2888288 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 && \ + pipx install aws-sam-cli==1.4.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index c585ba0a..f1793a29 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 && \ + pipx install aws-sam-cli==1.4.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 0c5a0205..2669e789 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index d29cb706..bdfcd550 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index fa4732a0..7e507787 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index d64f8e68..3137fe0d 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 3c533df0..e92651d7 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 1cc57ffc..760d0c60 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index becdd201..b4dfc74e 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index e3e0f5f0..e1c2a8db 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 790a2b1b..be39d278 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 128daae4..6f48d488 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 928c7ea5..3593c5f9 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 1d078d19..11e3ef31 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.0 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index ac502307..49aac79e 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.0 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 1c40d5d4..1072eb9a 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.0 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 + pipx install aws-sam-cli==1.4.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index d9264d13..611e2d4c 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 && \ + pipx install aws-sam-cli==1.4.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 4cd46196..69833022 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.3.2 && \ + pipx install aws-sam-cli==1.4.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 3839aa3db6215b199fee52703fbd9007d00b1884 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Mon, 5 Oct 2020 08:41:59 -0400 Subject: [PATCH 54/83] Update poetry to 1.1.1 in python images --- python2.7/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index 97facea9..a30b6136 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -11,7 +11,7 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.0/get-poetry.py | POETRY_VERSION=1.1.0 python && \ + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.1/get-poetry.py | POETRY_VERSION=1.1.1 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 11e3ef31..5a3f324c 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -27,7 +27,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.0 && \ + pipx install poetry==1.1.1 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.4.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 49aac79e..a4adc0ac 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.0 && \ + pipx install poetry==1.1.1 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.4.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 1072eb9a..0b3257aa 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.0 && \ + pipx install poetry==1.1.1 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.4.0 From 3f85c1a49c1527cbb9245054eb5947a5a9a5e618 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 6 Oct 2020 16:46:58 -0400 Subject: [PATCH 55/83] Update poetry to 1.1.2 in python images --- python2.7/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index a30b6136..6e3c3727 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -11,7 +11,7 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.1/get-poetry.py | POETRY_VERSION=1.1.1 python && \ + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.1/get-poetry.py | POETRY_VERSION=1.1.2 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 5a3f324c..9288dec5 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -27,7 +27,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.1 && \ + pipx install poetry==1.1.2 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.4.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index a4adc0ac..c39c5b46 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.1 && \ + pipx install poetry==1.1.2 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.4.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 0b3257aa..1913ede8 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.1 && \ + pipx install poetry==1.1.2 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.4.0 From a38b0ee3b2381ddbd18e05d7c888e02d68b14377 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 9 Oct 2020 08:58:03 -0400 Subject: [PATCH 56/83] Update aws-sam-cli to 1.6.2 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index fbeed971..c81f5a8d 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index e2888288..bddb00c2 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 && \ + pipx install aws-sam-cli==1.6.2 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index f1793a29..9d1bc68f 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 && \ + pipx install aws-sam-cli==1.6.2 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 2669e789..f051bea7 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index bdfcd550..e413e546 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 7e507787..64e2944e 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 3137fe0d..33cb7352 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index e92651d7..f4e9a3ea 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 760d0c60..b78b82d4 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index b4dfc74e..56513f6c 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index e1c2a8db..5949ba66 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index be39d278..3fa8af62 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 6f48d488..0f918c25 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 3593c5f9..e750bab2 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 9288dec5..dfdd73cc 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.2 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index c39c5b46..5defbda8 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.2 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 1913ede8..8072dcf6 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.2 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 + pipx install aws-sam-cli==1.6.2 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 611e2d4c..f9abb231 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 && \ + pipx install aws-sam-cli==1.6.2 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 69833022..968b1ee3 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.4.0 && \ + pipx install aws-sam-cli==1.6.2 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 071d2044e131803c0d5467897018a0713f643910 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 14 Oct 2020 16:01:31 -0400 Subject: [PATCH 57/83] Update gradle to 6.7 --- java11/build/Dockerfile | 4 ++-- java8.al2/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index e413e546..b5bb9683 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -10,12 +10,12 @@ COPY --from=0 /var/runtime /var/runtime COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid -RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ +RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 64e2944e..c394c93f 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -13,12 +13,12 @@ COPY --from=0 /var/rapid /var/rapid RUN rm -rf /var/lang/* && \ curl -sSL https://corretto.aws/downloads/resources/8.265.01.1/amazon-corretto-8.265.01.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ rm -rf /var/lang/*.zip && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 33cb7352..0fcaf577 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -11,12 +11,12 @@ COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid RUN yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.6.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.6.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 From 0785576d99dd6a4228057513042823002ffabfac Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 14 Oct 2020 16:02:19 -0400 Subject: [PATCH 58/83] Update poetry to 1.1.3 --- python2.7/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index 6e3c3727..57fbc3c8 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -11,7 +11,7 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.1/get-poetry.py | POETRY_VERSION=1.1.2 python && \ + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.1/get-poetry.py | POETRY_VERSION=1.1.3 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index dfdd73cc..17e562cb 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -27,7 +27,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.2 && \ + pipx install poetry==1.1.3 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.6.2 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 5defbda8..75b401a9 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.2 && \ + pipx install poetry==1.1.3 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.6.2 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 8072dcf6..580df2ef 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.2 && \ + pipx install poetry==1.1.3 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.6.2 From d6d3a9ab4dd79894711c96d0b490ceacb57aec7a Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Wed, 14 Oct 2020 16:03:02 -0400 Subject: [PATCH 59/83] Update dotnetcore to 3.1.403 sdk --- dotnetcore3.1/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 9d1bc68f..82aa9123 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -8,7 +8,7 @@ ENV DOTNET_ROOT=/var/lang/bin ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_dotnetcore3.1 \ - DOTNET_SDK_VERSION=3.1.402 \ + DOTNET_SDK_VERSION=3.1.403 \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip From 082853b3cf1898b8516424aca4bf3644ae70eca5 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sat, 24 Oct 2020 13:45:46 -0400 Subject: [PATCH 60/83] Bump poetry to 1.1.4 in python runtimes --- python2.7/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index 57fbc3c8..826024bd 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -11,7 +11,7 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ - curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.1/get-poetry.py | POETRY_VERSION=1.1.3 python && \ + curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.4/get-poetry.py | POETRY_VERSION=1.1.4 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir ENV PATH=/root/.poetry/bin:$PATH diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 17e562cb..40d29044 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -27,7 +27,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.3 && \ + pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.6.2 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 75b401a9..35ba7e82 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.3 && \ + pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.6.2 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 580df2ef..0197a882 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -18,7 +18,7 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pip install pipx --no-cache-dir && \ pipx install virtualenv && \ pipx install pipenv && \ - pipx install poetry==1.1.3 && \ + pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ pipx install aws-sam-cli==1.6.2 From 0a1f88a0ccf199e2db68c8e665500d8a76e1930b Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sat, 24 Oct 2020 14:11:41 -0400 Subject: [PATCH 61/83] Update package list in base images --- base/amazonlinux1.txt | 2 +- base/base-2/amazonlinux2.txt | 14 +++++++------- base/packages.txt | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/base/amazonlinux1.txt b/base/amazonlinux1.txt index a02b765a..98715fb1 100644 --- a/base/amazonlinux1.txt +++ b/base/amazonlinux1.txt @@ -92,7 +92,7 @@ sqlite-3.7.17-8.14.amzn1.x86_64 sysctl-defaults-1.0-1.1.amzn1.noarch system-release-2018.03-0.0.noarch tar-1.26-31.22.amzn1.x86_64 -tzdata-2019c-1.73.amzn1.noarch +tzdata-2020a-1.75.amzn1.noarch xz-libs-5.2.2-1.13.amzn1.x86_64 yum-3.4.3-150.71.amzn1.noarch yum-metadata-parser-1.1.4-10.20.amzn1.x86_64 diff --git a/base/base-2/amazonlinux2.txt b/base/base-2/amazonlinux2.txt index ac90985e..0a66ec0b 100644 --- a/base/base-2/amazonlinux2.txt +++ b/base/base-2/amazonlinux2.txt @@ -43,7 +43,7 @@ libgcc-7.3.1-9.amzn2.x86_64 libgcrypt-1.5.3-14.amzn2.0.2.x86_64 libgpg-error-1.12-3.amzn2.0.3.x86_64 libidn2-2.3.0-1.amzn2.x86_64 -libmetalink-0.1.2-7.amzn2.0.2.x86_64 +libmetalink-0.1.3-13.amzn2.x86_64 libmount-2.30.2-2.amzn2.0.4.x86_64 libnghttp2-1.41.0-1.amzn2.x86_64 libselinux-2.5-12.amzn2.0.2.x86_64 @@ -69,8 +69,8 @@ nss-tools-3.44.0-7.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 openldap-2.4.44-15.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 -p11-kit-0.23.19-1.amzn2.x86_64 -p11-kit-trust-0.23.19-1.amzn2.x86_64 +p11-kit-0.23.21-2.amzn2.0.1.x86_64 +p11-kit-trust-0.23.21-2.amzn2.0.1.x86_64 pcre-8.32-17.amzn2.0.2.x86_64 pinentry-0.8.1-17.amzn2.0.2.x86_64 popt-1.13-16.amzn2.0.2.x86_64 @@ -82,12 +82,12 @@ python-iniparse-0.4-9.amzn2.noarch python-libs-2.7.18-1.amzn2.0.2.x86_64 python-pycurl-7.19.0-19.amzn2.0.2.x86_64 python-urlgrabber-3.10-9.amzn2.0.1.noarch -python2-rpm-4.11.3-40.amzn2.0.4.x86_64 +python2-rpm-4.11.3-40.amzn2.0.5.x86_64 pyxattr-0.5.1-5.amzn2.0.2.x86_64 readline-6.2-10.amzn2.0.2.x86_64 -rpm-4.11.3-40.amzn2.0.4.x86_64 -rpm-build-libs-4.11.3-40.amzn2.0.4.x86_64 -rpm-libs-4.11.3-40.amzn2.0.4.x86_64 +rpm-4.11.3-40.amzn2.0.5.x86_64 +rpm-build-libs-4.11.3-40.amzn2.0.5.x86_64 +rpm-libs-4.11.3-40.amzn2.0.5.x86_64 sed-4.2.2-5.amzn2.0.2.x86_64 setup-2.8.71-10.amzn2.0.1.noarch shared-mime-info-1.8-4.amzn2.x86_64 diff --git a/base/packages.txt b/base/packages.txt index b1cd85be..ed4de740 100644 --- a/base/packages.txt +++ b/base/packages.txt @@ -181,16 +181,16 @@ popt-1.13-7.7.amzn1.x86_64 procps-3.2.8-45.16.amzn1.x86_64 psmisc-22.20-8.12.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.18-1.138.amzn1.x86_64 +python27-2.7.18-2.139.amzn1.x86_64 python27-iniparse-0.3.1-2.1.9.amzn1.noarch -python27-libs-2.7.18-1.138.amzn1.x86_64 +python27-libs-2.7.18-2.139.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 python27-pyxattr-0.5.0-1.6.amzn1.x86_64 python27-urlgrabber-3.10-8.16.amzn1.noarch -python36-3.6.11-1.17.amzn1.x86_64 -python36-libs-3.6.11-1.17.amzn1.x86_64 +python36-3.6.12-1.19.amzn1.x86_64 +python36-libs-3.6.12-1.19.amzn1.x86_64 python36-pip-9.0.3-1.27.amzn1.noarch python36-setuptools-36.2.7-1.33.amzn1.noarch readline-6.2-9.14.amzn1.x86_64 @@ -207,8 +207,8 @@ sysctl-defaults-1.0-1.1.amzn1.noarch system-release-2018.03-0.0.noarch tar-1.26-31.22.amzn1.x86_64 ttmkfdir-3.0.9-32.1.5.amzn1.x86_64 -tzdata-2019c-1.73.amzn1.noarch -tzdata-java-2019c-1.73.amzn1.noarch +tzdata-2020a-1.75.amzn1.noarch +tzdata-java-2020a-1.75.amzn1.noarch unzip-6.0-4.10.amzn1.x86_64 urw-fonts-2.4-10.7.amzn1.noarch util-linux-2.23.2-59.29.amzn1.x86_64 From 27a9af159daf17bf0a25ca932b656ab7c0d796cd Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 29 Oct 2020 20:05:31 -0400 Subject: [PATCH 62/83] Update aws-sam-cli to 1.7.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index c81f5a8d..e675411e 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index bddb00c2..0e0da528 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 && \ + pipx install aws-sam-cli==1.7.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 82aa9123..c0bcd242 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 && \ + pipx install aws-sam-cli==1.7.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index f051bea7..b22fdb72 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index b5bb9683..abf973f1 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index c394c93f..2e14492d 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 0fcaf577..c8ee4c94 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index f4e9a3ea..3bb9c466 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index b78b82d4..9e38767e 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 56513f6c..4a57e33d 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 5949ba66..9efe61f3 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 3fa8af62..4d17101a 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 0f918c25..4a588655 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index e750bab2..3beb63e5 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 40d29044..94b3fdd0 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 35ba7e82..08373525 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 0197a882..3e996ce6 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 + pipx install aws-sam-cli==1.7.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index f9abb231..832f92dd 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 && \ + pipx install aws-sam-cli==1.7.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 968b1ee3..9ba9965e 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.6.2 && \ + pipx install aws-sam-cli==1.7.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From ce25a2d132b775c4c902e994f5a448ba85c3c1af Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 29 Oct 2020 20:08:44 -0400 Subject: [PATCH 63/83] Update base2 packages --- base/amazonlinux1.txt | 12 ++++++------ base/base-2/amazonlinux2.txt | 24 ++++++++++++------------ base/base-2/packages.txt | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/amazonlinux1.txt b/base/amazonlinux1.txt index 98715fb1..beed053c 100644 --- a/base/amazonlinux1.txt +++ b/base/amazonlinux1.txt @@ -46,8 +46,8 @@ libstdc++72-7.2.1-2.59.amzn1.x86_64 libtasn1-2.3-6.6.amzn1.x86_64 libunistring-0.9.3-6.1.amzn1.x86_64 libverto-0.2.5-4.9.amzn1.x86_64 -libxml2-2.9.1-6.4.40.amzn1.x86_64 -libxml2-python27-2.9.1-6.4.40.amzn1.x86_64 +libxml2-2.9.1-6.4.41.amzn1.x86_64 +libxml2-python27-2.9.1-6.4.41.amzn1.x86_64 lua-5.1.4-4.1.9.amzn1.x86_64 make-3.82-21.10.amzn1.x86_64 ncurses-5.7-4.20090207.14.amzn1.x86_64 @@ -81,10 +81,10 @@ python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 python27-pyxattr-0.5.0-1.6.amzn1.x86_64 python27-urlgrabber-3.10-8.16.amzn1.noarch readline-6.2-9.14.amzn1.x86_64 -rpm-4.11.3-40.77.amzn1.x86_64 -rpm-build-libs-4.11.3-40.77.amzn1.x86_64 -rpm-libs-4.11.3-40.77.amzn1.x86_64 -rpm-python27-4.11.3-40.77.amzn1.x86_64 +rpm-4.11.3-40.78.amzn1.x86_64 +rpm-build-libs-4.11.3-40.78.amzn1.x86_64 +rpm-libs-4.11.3-40.78.amzn1.x86_64 +rpm-python27-4.11.3-40.78.amzn1.x86_64 sed-4.2.1-10.10.amzn1.x86_64 setup-2.8.14-20.12.amzn1.noarch shared-mime-info-1.1-9.8.amzn1.x86_64 diff --git a/base/base-2/amazonlinux2.txt b/base/base-2/amazonlinux2.txt index 0a66ec0b..3dee288d 100644 --- a/base/base-2/amazonlinux2.txt +++ b/base/base-2/amazonlinux2.txt @@ -1,26 +1,26 @@ amazon-linux-extras-1.6.12-1.amzn2.noarch basesystem-10.0-7.amzn2.0.1.noarch -bash-4.2.46-33.amzn2.x86_64 +bash-4.2.46-34.amzn2.x86_64 bzip2-libs-1.0.6-13.amzn2.0.2.x86_64 ca-certificates-2019.2.32-76.amzn2.0.3.noarch chkconfig-1.7.4-1.amzn2.0.2.x86_64 coreutils-8.22-24.amzn2.x86_64 -cpio-2.11-27.amzn2.x86_64 +cpio-2.11-28.amzn2.x86_64 curl-7.61.1-12.amzn2.0.2.x86_64 cyrus-sasl-lib-2.1.26-23.amzn2.x86_64 diffutils-3.3-5.amzn2.x86_64 elfutils-libelf-0.176-2.amzn2.x86_64 -expat-2.1.0-10.amzn2.0.2.x86_64 +expat-2.1.0-12.amzn2.x86_64 file-libs-5.11-36.amzn2.0.1.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 findutils-4.5.11-6.amzn2.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 gdbm-1.13-6.amzn2.0.2.x86_64 glib2-2.56.1-5.amzn2.0.1.x86_64 -glibc-2.26-35.amzn2.x86_64 -glibc-common-2.26-35.amzn2.x86_64 -glibc-langpack-en-2.26-35.amzn2.x86_64 -glibc-minimal-langpack-2.26-35.amzn2.x86_64 +glibc-2.26-37.amzn2.x86_64 +glibc-common-2.26-37.amzn2.x86_64 +glibc-langpack-en-2.26-37.amzn2.x86_64 +glibc-minimal-langpack-2.26-37.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 gnupg2-2.0.22-5.amzn2.0.4.x86_64 gpgme-1.3.2-5.amzn2.0.2.x86_64 @@ -33,8 +33,8 @@ libassuan-2.1.0-3.amzn2.0.2.x86_64 libattr-2.4.46-12.amzn2.0.2.x86_64 libblkid-2.30.2-2.amzn2.0.4.x86_64 libcap-2.22-9.amzn2.0.2.x86_64 -libcom_err-1.42.9-12.amzn2.0.2.x86_64 -libcrypt-2.26-35.amzn2.x86_64 +libcom_err-1.42.9-19.amzn2.x86_64 +libcrypt-2.26-37.amzn2.x86_64 libcurl-7.61.1-12.amzn2.0.2.x86_64 libdb-5.3.21-24.amzn2.0.3.x86_64 libdb-utils-5.3.21-24.amzn2.0.3.x86_64 @@ -48,13 +48,13 @@ libmount-2.30.2-2.amzn2.0.4.x86_64 libnghttp2-1.41.0-1.amzn2.x86_64 libselinux-2.5-12.amzn2.0.2.x86_64 libsepol-2.5-8.1.amzn2.0.2.x86_64 -libssh2-1.4.3-12.amzn2.2.2.x86_64 +libssh2-1.4.3-12.amzn2.2.3.x86_64 libstdc++-7.3.1-9.amzn2.x86_64 libtasn1-4.10-1.amzn2.0.2.x86_64 libunistring-0.9.3-9.amzn2.0.2.x86_64 libuuid-2.30.2-2.amzn2.0.4.x86_64 libverto-0.2.5-4.amzn2.0.2.x86_64 -libxml2-2.9.1-6.amzn2.4.1.x86_64 +libxml2-2.9.1-6.amzn2.5.1.x86_64 lua-5.1.4-15.amzn2.0.2.x86_64 ncurses-6.0-8.20170212.amzn2.1.3.x86_64 ncurses-base-6.0-8.20170212.amzn2.1.3.noarch @@ -67,7 +67,7 @@ nss-softokn-freebl-3.44.0-8.amzn2.x86_64 nss-sysinit-3.44.0-7.amzn2.x86_64 nss-tools-3.44.0-7.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 -openldap-2.4.44-15.amzn2.x86_64 +openldap-2.4.44-22.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 p11-kit-0.23.21-2.amzn2.0.1.x86_64 p11-kit-trust-0.23.21-2.amzn2.0.1.x86_64 diff --git a/base/base-2/packages.txt b/base/base-2/packages.txt index 18018541..85f41c16 100644 --- a/base/base-2/packages.txt +++ b/base/base-2/packages.txt @@ -33,8 +33,8 @@ nspr-4.21.0-1.amzn2.0.2.x86_64 nss-softokn-freebl-3.44.0-8.amzn2.x86_64 nss-util-3.44.0-4.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 -p11-kit-0.23.19-1.amzn2.x86_64 -p11-kit-trust-0.23.19-1.amzn2.x86_64 +p11-kit-0.23.21-2.amzn2.0.1.x86_64 +p11-kit-trust-0.23.21-2.amzn2.0.1.x86_64 pcre-8.32-17.amzn2.0.2.x86_64 popt-1.13-16.amzn2.0.2.x86_64 sed-4.2.2-5.amzn2.0.2.x86_64 From b8069e22612c44305ed28188d672429f2b69b891 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 5 Nov 2020 21:13:22 -0500 Subject: [PATCH 64/83] Update aws-sam-cli to 1.8.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index e675411e..fc8216ba 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 0e0da528..80626c55 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 && \ + pipx install aws-sam-cli==1.8.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index c0bcd242..62792b41 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 && \ + pipx install aws-sam-cli==1.8.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index b22fdb72..6bacf73b 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index abf973f1..a4f33612 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 2e14492d..d54a88ea 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index c8ee4c94..11bb8f4f 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 3bb9c466..69557bb4 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 9e38767e..d5eaaac1 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 4a57e33d..09aee3e4 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 9efe61f3..a8287d23 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 4d17101a..e50647dd 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 4a588655..14ed1022 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 3beb63e5..f1980e41 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 94b3fdd0..23ad8d3a 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 08373525..2074777a 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 3e996ce6..8d67f17f 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 + pipx install aws-sam-cli==1.8.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 832f92dd..4443df93 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 && \ + pipx install aws-sam-cli==1.8.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 9ba9965e..540e6625 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.7.0 && \ + pipx install aws-sam-cli==1.8.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 8192be17f92d23304c737cd37592eac80ae536e0 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 10 Nov 2020 14:13:10 -0500 Subject: [PATCH 65/83] Update base and base2 packages --- base/base-2/Dockerfile | 2 +- base/base-2/packages.txt | 12 ++++++------ base/packages.txt | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/base-2/Dockerfile b/base/base-2/Dockerfile index 41750c26..aba6aa99 100644 --- a/base/base-2/Dockerfile +++ b/base/base-2/Dockerfile @@ -6,7 +6,7 @@ FROM amazonlinux:2 ADD ./base-2.tgz /opt/ RUN yum --installroot=/opt reinstall -y filesystem-3.2-25.amzn2.0.4 \ - setup-2.8.71-10.amzn2.0.1 glibc-2.26-35.amzn2 glibc-common-2.26-35.amzn2 && \ + setup-2.8.71-10.amzn2.0.1 glibc-2.26-37.amzn2 glibc-common-2.26-37.amzn2 && \ yum --installroot=/opt clean all FROM scratch diff --git a/base/base-2/packages.txt b/base/base-2/packages.txt index 85f41c16..b306a3a8 100644 --- a/base/base-2/packages.txt +++ b/base/base-2/packages.txt @@ -1,14 +1,14 @@ basesystem-10.0-7.amzn2.0.1.noarch -bash-4.2.46-33.amzn2.x86_64 +bash-4.2.46-34.amzn2.x86_64 ca-certificates-2019.2.32-76.amzn2.0.3.noarch chkconfig-1.7.4-1.amzn2.0.2.x86_64 coreutils-8.22-24.amzn2.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 -glibc-2.26-35.amzn2.x86_64 -glibc-all-langpacks-2.26-35.amzn2.x86_64 -glibc-common-2.26-35.amzn2.x86_64 -glibc-minimal-langpack-2.26-35.amzn2.x86_64 +glibc-2.26-37.amzn2.x86_64 +glibc-all-langpacks-2.26-37.amzn2.x86_64 +glibc-common-2.26-37.amzn2.x86_64 +glibc-minimal-langpack-2.26-37.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 grep-2.20-3.amzn2.0.2.x86_64 info-5.1-5.amzn2.x86_64 @@ -17,7 +17,7 @@ krb5-libs-1.15.1-37.amzn2.2.2.x86_64 libacl-2.2.51-14.amzn2.x86_64 libattr-2.4.46-12.amzn2.0.2.x86_64 libcap-2.22-9.amzn2.0.2.x86_64 -libcom_err-1.42.9-12.amzn2.0.2.x86_64 +libcom_err-1.42.9-19.amzn2.x86_64 libffi-3.0.13-18.amzn2.0.2.x86_64 libgcc-7.3.1-9.amzn2.x86_64 libicu-50.2-4.amzn2.x86_64 diff --git a/base/packages.txt b/base/packages.txt index ed4de740..efe940a0 100644 --- a/base/packages.txt +++ b/base/packages.txt @@ -119,7 +119,7 @@ libuuid-2.23.2-59.29.amzn1.x86_64 libverto-0.2.5-4.9.amzn1.x86_64 libwmf-lite-0.2.8.4-41.13.amzn1.x86_64 libxcb-1.11-2.21.amzn1.x86_64 -libxml2-2.9.1-6.4.40.amzn1.x86_64 +libxml2-2.9.1-6.4.41.amzn1.x86_64 libxshmfence-1.2-1.4.amzn1.x86_64 libxslt-1.1.28-5.13.amzn1.x86_64 lksctp-tools-1.0.10-7.7.amzn1.x86_64 @@ -194,10 +194,10 @@ python36-libs-3.6.12-1.19.amzn1.x86_64 python36-pip-9.0.3-1.27.amzn1.noarch python36-setuptools-36.2.7-1.33.amzn1.noarch readline-6.2-9.14.amzn1.x86_64 -rpm-4.11.3-40.77.amzn1.x86_64 -rpm-build-libs-4.11.3-40.77.amzn1.x86_64 -rpm-libs-4.11.3-40.77.amzn1.x86_64 -rpm-python27-4.11.3-40.77.amzn1.x86_64 +rpm-4.11.3-40.78.amzn1.x86_64 +rpm-build-libs-4.11.3-40.78.amzn1.x86_64 +rpm-libs-4.11.3-40.78.amzn1.x86_64 +rpm-python27-4.11.3-40.78.amzn1.x86_64 sed-4.2.1-10.10.amzn1.x86_64 setup-2.8.14-20.12.amzn1.noarch shadow-utils-4.1.4.2-13.10.amzn1.x86_64 From 64b72bf9c918aa7df3a31abeb1e321e97eb13468 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 10 Nov 2020 14:13:26 -0500 Subject: [PATCH 66/83] Update aws-sam-cli to 1.9.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index fc8216ba..25be1128 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 80626c55..ec92d1ce 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 && \ + pipx install aws-sam-cli==1.9.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 62792b41..b2c54335 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 && \ + pipx install aws-sam-cli==1.9.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 6bacf73b..f5eb80af 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index a4f33612..32714825 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index d54a88ea..0eb718e0 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 11bb8f4f..55090f57 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 69557bb4..888f19a0 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index d5eaaac1..96979a34 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 09aee3e4..c99b7ead 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index a8287d23..a87475eb 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index e50647dd..f9b7ba54 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 14ed1022..bed28c2b 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index f1980e41..c528baaa 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 23ad8d3a..3d54de23 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 2074777a..0f2b5629 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 8d67f17f..caf35d3d 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 + pipx install aws-sam-cli==1.9.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 4443df93..2aa06958 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 && \ + pipx install aws-sam-cli==1.9.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 540e6625..2a04349f 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.8.0 && \ + pipx install aws-sam-cli==1.9.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 1d8714b313f3a1fc51beb39fb9cab4401b974926 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Tue, 10 Nov 2020 14:13:39 -0500 Subject: [PATCH 67/83] Update .NET SDK to 3.1.404 --- dotnetcore3.1/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index b2c54335..ae78cd10 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -8,7 +8,7 @@ ENV DOTNET_ROOT=/var/lang/bin ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_dotnetcore3.1 \ - DOTNET_SDK_VERSION=3.1.403 \ + DOTNET_SDK_VERSION=3.1.404 \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip From 93e48e987c353d4f0fe2b6901fcbb6598e791a97 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 12 Nov 2020 17:01:56 -0500 Subject: [PATCH 68/83] Update aws-sam-cli to 1.10.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 25be1128..c303fb80 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index ec92d1ce..b9a0fe39 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 && \ + pipx install aws-sam-cli==1.10.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index ae78cd10..bc6e3ef1 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 && \ + pipx install aws-sam-cli==1.10.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index f5eb80af..bd7d4692 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 32714825..78204a2b 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 0eb718e0..911c9900 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 55090f57..27b3c83f 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/b RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 888f19a0..9343b6ad 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index 96979a34..b23eec65 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index c99b7ead..0f181c48 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index a87475eb..54b8fa53 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index f9b7ba54..7dea26c7 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index bed28c2b..0e03e0d4 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index c528baaa..a4bde671 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 3d54de23..8d0b6ffa 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 0f2b5629..3378bf48 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index caf35d3d..b9eca049 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 + pipx install aws-sam-cli==1.10.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 2aa06958..6e483431 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 && \ + pipx install aws-sam-cli==1.10.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 2a04349f..3b65e546 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.9.0 && \ + pipx install aws-sam-cli==1.10.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From b281a1e5767ff499eacc8963230dd4b09f39eb0e Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Mon, 16 Nov 2020 13:44:51 -0500 Subject: [PATCH 69/83] Update gradle to 6.7.1 in java build images --- java11/build/Dockerfile | 4 ++-- java8.al2/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 78204a2b..fdaca1df 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -10,12 +10,12 @@ COPY --from=0 /var/runtime /var/runtime COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid -RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7-bin.zip && \ +RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 911c9900..a69d5dd9 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -13,12 +13,12 @@ COPY --from=0 /var/rapid /var/rapid RUN rm -rf /var/lang/* && \ curl -sSL https://corretto.aws/downloads/resources/8.265.01.1/amazon-corretto-8.265.01.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ rm -rf /var/lang/*.zip && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 27b3c83f..5b60c838 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -11,12 +11,12 @@ COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid RUN yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.7/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 From af0840e6f9ff474662059a26187419013a7f9df4 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sun, 22 Nov 2020 10:05:31 -0500 Subject: [PATCH 70/83] Update packages in base builds --- base/amazonlinux1.txt | 8 ++++---- base/base-2/Dockerfile | 2 +- base/base-2/amazonlinux2.txt | 26 +++++++++++++------------- base/base-2/packages.txt | 14 +++++++------- base/packages.txt | 10 +++++----- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/base/amazonlinux1.txt b/base/amazonlinux1.txt index beed053c..4d630e4b 100644 --- a/base/amazonlinux1.txt +++ b/base/amazonlinux1.txt @@ -4,7 +4,7 @@ bzip2-libs-1.0.6-8.12.amzn1.x86_64 ca-certificates-2018.2.22-65.1.22.amzn1.noarch chkconfig-1.3.49.3-2.14.amzn1.x86_64 coreutils-8.22-15.52.amzn1.x86_64 -curl-7.61.1-12.94.amzn1.x86_64 +curl-7.61.1-12.95.amzn1.x86_64 cyrus-sasl-lib-2.1.23-13.16.amzn1.x86_64 db4-4.7.25-18.11.amzn1.x86_64 db4-utils-4.7.25-18.11.amzn1.x86_64 @@ -30,7 +30,7 @@ libassuan-2.0.3-3.3.amzn1.x86_64 libattr-2.4.46-12.10.amzn1.x86_64 libcap-2.16-5.5.8.amzn1.x86_64 libcom_err-1.43.5-2.43.amzn1.x86_64 -libcurl-7.61.1-12.94.amzn1.x86_64 +libcurl-7.61.1-12.95.amzn1.x86_64 libffi-3.0.13-16.5.amzn1.x86_64 libgcc72-7.2.1-2.59.amzn1.x86_64 libgcrypt-1.5.3-12.19.amzn1.x86_64 @@ -70,11 +70,11 @@ pinentry-0.7.6-6.11.amzn1.x86_64 pkgconfig-0.27.1-2.7.amzn1.x86_64 popt-1.13-7.7.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.18-2.139.amzn1.x86_64 +python27-2.7.18-2.140.amzn1.x86_64 python27-chardet-2.0.1-7.7.amzn1.noarch python27-iniparse-0.3.1-2.1.9.amzn1.noarch python27-kitchen-1.1.1-5.6.amzn1.noarch -python27-libs-2.7.18-2.139.amzn1.x86_64 +python27-libs-2.7.18-2.140.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 diff --git a/base/base-2/Dockerfile b/base/base-2/Dockerfile index aba6aa99..42ca14d7 100644 --- a/base/base-2/Dockerfile +++ b/base/base-2/Dockerfile @@ -6,7 +6,7 @@ FROM amazonlinux:2 ADD ./base-2.tgz /opt/ RUN yum --installroot=/opt reinstall -y filesystem-3.2-25.amzn2.0.4 \ - setup-2.8.71-10.amzn2.0.1 glibc-2.26-37.amzn2 glibc-common-2.26-37.amzn2 && \ + setup-2.8.71-10.amzn2.0.1 glibc-2.26-37.amzn2 glibc-common-2.26-38.amzn2 && \ yum --installroot=/opt clean all FROM scratch diff --git a/base/base-2/amazonlinux2.txt b/base/base-2/amazonlinux2.txt index 3dee288d..39e195e2 100644 --- a/base/base-2/amazonlinux2.txt +++ b/base/base-2/amazonlinux2.txt @@ -16,11 +16,11 @@ filesystem-3.2-25.amzn2.0.4.x86_64 findutils-4.5.11-6.amzn2.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 gdbm-1.13-6.amzn2.0.2.x86_64 -glib2-2.56.1-5.amzn2.0.1.x86_64 -glibc-2.26-37.amzn2.x86_64 -glibc-common-2.26-37.amzn2.x86_64 -glibc-langpack-en-2.26-37.amzn2.x86_64 -glibc-minimal-langpack-2.26-37.amzn2.x86_64 +glib2-2.56.1-7.amzn2.0.1.x86_64 +glibc-2.26-38.amzn2.x86_64 +glibc-common-2.26-38.amzn2.x86_64 +glibc-langpack-en-2.26-38.amzn2.x86_64 +glibc-minimal-langpack-2.26-38.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 gnupg2-2.0.22-5.amzn2.0.4.x86_64 gpgme-1.3.2-5.amzn2.0.2.x86_64 @@ -34,7 +34,7 @@ libattr-2.4.46-12.amzn2.0.2.x86_64 libblkid-2.30.2-2.amzn2.0.4.x86_64 libcap-2.22-9.amzn2.0.2.x86_64 libcom_err-1.42.9-19.amzn2.x86_64 -libcrypt-2.26-37.amzn2.x86_64 +libcrypt-2.26-38.amzn2.x86_64 libcurl-7.61.1-12.amzn2.0.2.x86_64 libdb-5.3.21-24.amzn2.0.3.x86_64 libdb-utils-5.3.21-24.amzn2.0.3.x86_64 @@ -59,14 +59,14 @@ lua-5.1.4-15.amzn2.0.2.x86_64 ncurses-6.0-8.20170212.amzn2.1.3.x86_64 ncurses-base-6.0-8.20170212.amzn2.1.3.noarch ncurses-libs-6.0-8.20170212.amzn2.1.3.x86_64 -nspr-4.21.0-1.amzn2.0.2.x86_64 -nss-3.44.0-7.amzn2.x86_64 +nspr-4.25.0-2.amzn2.x86_64 +nss-3.53.1-3.amzn2.x86_64 nss-pem-1.0.3-5.amzn2.x86_64 -nss-softokn-3.44.0-8.amzn2.x86_64 -nss-softokn-freebl-3.44.0-8.amzn2.x86_64 -nss-sysinit-3.44.0-7.amzn2.x86_64 -nss-tools-3.44.0-7.amzn2.x86_64 -nss-util-3.44.0-4.amzn2.x86_64 +nss-softokn-3.53.1-6.amzn2.x86_64 +nss-softokn-freebl-3.53.1-6.amzn2.x86_64 +nss-sysinit-3.53.1-3.amzn2.x86_64 +nss-tools-3.53.1-3.amzn2.x86_64 +nss-util-3.53.1-1.amzn2.x86_64 openldap-2.4.44-22.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 p11-kit-0.23.21-2.amzn2.0.1.x86_64 diff --git a/base/base-2/packages.txt b/base/base-2/packages.txt index b306a3a8..88d114d4 100644 --- a/base/base-2/packages.txt +++ b/base/base-2/packages.txt @@ -5,10 +5,10 @@ chkconfig-1.7.4-1.amzn2.0.2.x86_64 coreutils-8.22-24.amzn2.x86_64 filesystem-3.2-25.amzn2.0.4.x86_64 gawk-4.0.2-4.amzn2.1.2.x86_64 -glibc-2.26-37.amzn2.x86_64 -glibc-all-langpacks-2.26-37.amzn2.x86_64 -glibc-common-2.26-37.amzn2.x86_64 -glibc-minimal-langpack-2.26-37.amzn2.x86_64 +glibc-2.26-38.amzn2.x86_64 +glibc-all-langpacks-2.26-38.amzn2.x86_64 +glibc-common-2.26-38.amzn2.x86_64 +glibc-minimal-langpack-2.26-38.amzn2.x86_64 gmp-6.0.0-15.amzn2.0.2.x86_64 grep-2.20-3.amzn2.0.2.x86_64 info-5.1-5.amzn2.x86_64 @@ -29,9 +29,9 @@ libverto-0.2.5-4.amzn2.0.2.x86_64 ncurses-6.0-8.20170212.amzn2.1.3.x86_64 ncurses-base-6.0-8.20170212.amzn2.1.3.noarch ncurses-libs-6.0-8.20170212.amzn2.1.3.x86_64 -nspr-4.21.0-1.amzn2.0.2.x86_64 -nss-softokn-freebl-3.44.0-8.amzn2.x86_64 -nss-util-3.44.0-4.amzn2.x86_64 +nspr-4.25.0-2.amzn2.x86_64 +nss-softokn-freebl-3.53.1-6.amzn2.x86_64 +nss-util-3.53.1-1.amzn2.x86_64 openssl-libs-1.0.2k-19.amzn2.0.3.x86_64 p11-kit-0.23.21-2.amzn2.0.1.x86_64 p11-kit-trust-0.23.21-2.amzn2.0.1.x86_64 diff --git a/base/packages.txt b/base/packages.txt index efe940a0..7e5e4fb1 100644 --- a/base/packages.txt +++ b/base/packages.txt @@ -17,7 +17,7 @@ cpio-2.10-12.12.amzn1.x86_64 cracklib-2.8.16-4.14.amzn1.x86_64 cracklib-dicts-2.8.16-4.14.amzn1.x86_64 cups-libs-1.4.2-67.21.amzn1.x86_64 -curl-7.61.1-12.94.amzn1.x86_64 +curl-7.61.1-12.95.amzn1.x86_64 cyrus-sasl-lib-2.1.23-13.16.amzn1.x86_64 db4-4.7.25-18.11.amzn1.x86_64 db4-utils-4.7.25-18.11.amzn1.x86_64 @@ -84,7 +84,7 @@ libblkid-2.23.2-59.29.amzn1.x86_64 libcap-2.16-5.5.8.amzn1.x86_64 libcap-ng-0.7.5-4.15.amzn1.x86_64 libcom_err-1.43.5-2.43.amzn1.x86_64 -libcurl-7.61.1-12.94.amzn1.x86_64 +libcurl-7.61.1-12.95.amzn1.x86_64 libdrm-2.4.82-1.14.amzn1.x86_64 libffi-3.0.13-16.5.amzn1.x86_64 libfontenc-1.0.5-2.6.amzn1.x86_64 @@ -109,7 +109,7 @@ libsmartcols-2.23.2-59.29.amzn1.x86_64 libssh2-1.4.2-3.12.amzn1.x86_64 libstdc++72-7.2.1-2.59.amzn1.x86_64 libtasn1-2.3-6.6.amzn1.x86_64 -libtiff-4.0.3-32.34.amzn1.x86_64 +libtiff-4.0.3-35.36.amzn1.x86_64 libtool-ltdl-2.4.2-20.4.8.5.32.amzn1.x86_64 libudev-173-4.13.amzn1.x86_64 libunistring-0.9.3-6.1.amzn1.x86_64 @@ -181,9 +181,9 @@ popt-1.13-7.7.amzn1.x86_64 procps-3.2.8-45.16.amzn1.x86_64 psmisc-22.20-8.12.amzn1.x86_64 pth-2.0.7-9.3.7.amzn1.x86_64 -python27-2.7.18-2.139.amzn1.x86_64 +python27-2.7.18-2.140.amzn1.x86_64 python27-iniparse-0.3.1-2.1.9.amzn1.noarch -python27-libs-2.7.18-2.139.amzn1.x86_64 +python27-libs-2.7.18-2.140.amzn1.x86_64 python27-pycurl-7.19.0-17.12.amzn1.x86_64 python27-pygpgme-0.3-9.12.amzn1.x86_64 python27-pyliblzma-0.5.3-11.6.amzn1.x86_64 From 4e1b563f26ec90e83d54af776924fb0fd0752c21 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sun, 22 Nov 2020 10:05:49 -0500 Subject: [PATCH 71/83] Update aws-sam-cli to 1.11.0 --- dotnetcore2.0/build/Dockerfile | 2 +- dotnetcore2.1/build/Dockerfile | 2 +- dotnetcore3.1/build/Dockerfile | 2 +- go1.x/build/Dockerfile | 2 +- java11/build/Dockerfile | 2 +- java8.al2/build/Dockerfile | 2 +- java8/build/Dockerfile | 2 +- nodejs10.x/build/Dockerfile | 2 +- nodejs12.x/build/Dockerfile | 2 +- nodejs4.3/build/Dockerfile | 2 +- nodejs6.10/build/Dockerfile | 2 +- nodejs8.10/build/Dockerfile | 2 +- provided.al2/build/Dockerfile | 2 +- provided/build/Dockerfile | 2 +- python3.6/build/Dockerfile | 2 +- python3.7/build/Dockerfile | 2 +- python3.8/build/Dockerfile | 2 +- ruby2.5/build/Dockerfile | 2 +- ruby2.7/build/Dockerfile | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index c303fb80..21140dda 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -30,6 +30,6 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index b9a0fe39..2b314be4 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -31,7 +31,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install pipenv && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 && \ + pipx install aws-sam-cli==1.11.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index bc6e3ef1..52f389c7 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -26,7 +26,7 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 && \ + pipx install aws-sam-cli==1.11.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index bd7d4692..7aa4e18b 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -24,6 +24,6 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index fdaca1df..419ef7ce 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -20,4 +20,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index a69d5dd9..fe734ea5 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 5b60c838..f0d0dd5b 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -23,4 +23,4 @@ ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 9343b6ad..31a81f5f 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index b23eec65..fcef1c7b 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -14,4 +14,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 0f181c48..8d1c7e8f 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index 54b8fa53..fbfba52a 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 7dea26c7..2191f84e 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index 0e03e0d4..aa77a92c 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -9,4 +9,4 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index a4bde671..2c3d392a 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -11,4 +11,4 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 8d0b6ffa..439a1c7d 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -30,4 +30,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 3378bf48..086e0f6a 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index b9eca049..1049db2b 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -21,4 +21,4 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 + pipx install aws-sam-cli==1.11.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 6e483431..8d783f04 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -19,6 +19,6 @@ COPY --from=0 /var/rapid /var/rapid RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 && \ + pipx install aws-sam-cli==1.11.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index 3b65e546..fd43b68d 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -17,6 +17,6 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.10.0 && \ + pipx install aws-sam-cli==1.11.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From b25f2695dec37f4b25c71f33ae3166075df38b6a Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Thu, 3 Dec 2020 13:06:05 -0500 Subject: [PATCH 72/83] Clarify dev packages on base images Addresses #321 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index df924a37..bb211d1f 100644 --- a/README.md +++ b/README.md @@ -397,6 +397,9 @@ Yum packages installed on build images: - `docker` (Docker in Docker!) - `clang` - `cmake` + +The build image for older Amazon Linux 1 based runtimes also include: + - `python27-devel` - `python36-devel` - `ImageMagick-devel` From 1fc4f2a4f3656e16297db508bbed9bc191a660ab Mon Sep 17 00:00:00 2001 From: novemberde Date: Sat, 19 Dec 2020 22:25:13 +0900 Subject: [PATCH 73/83] fix(log): apply billed duration by 1ms --- provided/run/init.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provided/run/init.go b/provided/run/init.go index 6b9339c2..9905cf2e 100644 --- a/provided/run/init.go +++ b/provided/run/init.go @@ -978,7 +978,7 @@ func (mc *mockLambdaContext) LogEndRequest() { "Billed Duration: %.f ms\t"+ "Memory Size: %s MB\t"+ "Max Memory Used: %d MB\t", - mc.RequestID, diffMs, math.Ceil(diffMs/100)*100, mc.MemSize, mc.MaxMem)) + mc.RequestID, diffMs, math.Ceil(diffMs), mc.MemSize, mc.MaxMem)) } type invokeResponse struct { From 7002aa01fff1952f12594af1a7f03e72a7cd1be8 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 09:28:14 -0500 Subject: [PATCH 74/83] Ensure we only use a 2.7-compatible pip for provided --- base/dump-provided.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/dump-provided.sh b/base/dump-provided.sh index 690ec844..9a3472f3 100755 --- a/base/dump-provided.sh +++ b/base/dump-provided.sh @@ -6,7 +6,7 @@ export HOME=/tmp export PATH=/tmp/.local/bin:$PATH cd /tmp -curl -sSL https://bootstrap.pypa.io/get-pip.py -o get-pip.py +curl -sSL https://bootstrap.pypa.io/2.7/get-pip.py -o get-pip.py python get-pip.py --user pip install --user awscli From dc04991bdc702b10279f0f1adb50ae09de0dc579 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 09:29:40 -0500 Subject: [PATCH 75/83] Bump gradle to 6.8.1 --- java11/build/Dockerfile | 4 ++-- java8.al2/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 419ef7ce..3b54f0a4 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -10,12 +10,12 @@ COPY --from=0 /var/runtime /var/runtime COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid -RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7.1-bin.zip && \ +RUN mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.8.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.8.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index fe734ea5..959d5832 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -13,12 +13,12 @@ COPY --from=0 /var/rapid /var/rapid RUN rm -rf /var/lang/* && \ curl -sSL https://corretto.aws/downloads/resources/8.265.01.1/amazon-corretto-8.265.01.1-linux-x64.tar.gz | tar -xz --strip-components=1 -C /var/lang && \ rm -rf /var/lang/*.zip && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.8.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.8.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index f0d0dd5b..83c9e60d 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -11,12 +11,12 @@ COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid RUN yum install -y java-1.8.0-openjdk-devel && \ - mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.7.1-bin.zip && \ + mkdir /usr/local/gradle && curl -L -o gradle.zip https://services.gradle.org/distributions/gradle-6.8.1-bin.zip && \ unzip -qd /usr/local/gradle gradle.zip && rm gradle.zip && mkdir /usr/local/maven && \ curl -L http://mirror.cc.columbia.edu/pub/software/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz | \ tar -zx -C /usr/local/maven -ENV PATH="/usr/local/gradle/gradle-6.7.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" +ENV PATH="/usr/local/gradle/gradle-6.8.1/bin:/usr/local/maven/apache-maven-3.6.3/bin:${PATH}" # Add these as a separate layer as they get updated frequently # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 From d17854762dbcce1bf22fd54c42a45fef6cba2e11 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 09:32:35 -0500 Subject: [PATCH 76/83] Bump .NET Core SDK to 3.1.405 --- dotnetcore3.1/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 52f389c7..18e114ac 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -8,7 +8,7 @@ ENV DOTNET_ROOT=/var/lang/bin ENV PATH=/root/.dotnet/tools:$DOTNET_ROOT:$PATH \ LD_LIBRARY_PATH=/var/lang/lib:$LD_LIBRARY_PATH \ AWS_EXECUTION_ENV=AWS_Lambda_dotnetcore3.1 \ - DOTNET_SDK_VERSION=3.1.404 \ + DOTNET_SDK_VERSION=3.1.405 \ DOTNET_CLI_TELEMETRY_OPTOUT=1 \ NUGET_XMLDOC_MODE=skip From 231bde0674894a215ac9a04a181924f62832230e Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 09:33:11 -0500 Subject: [PATCH 77/83] Bump aws-lambda-builders and aws-sam-cli versions --- dotnetcore2.0/build/Dockerfile | 4 ++-- dotnetcore2.1/build/Dockerfile | 4 ++-- dotnetcore3.1/build/Dockerfile | 4 ++-- go1.x/build/Dockerfile | 4 ++-- java11/build/Dockerfile | 4 ++-- java8.al2/build/Dockerfile | 4 ++-- java8/build/Dockerfile | 4 ++-- nodejs10.x/build/Dockerfile | 4 ++-- nodejs12.x/build/Dockerfile | 4 ++-- nodejs4.3/build/Dockerfile | 4 ++-- nodejs6.10/build/Dockerfile | 4 ++-- nodejs8.10/build/Dockerfile | 4 ++-- provided.al2/build/Dockerfile | 4 ++-- provided/build/Dockerfile | 4 ++-- python3.6/build/Dockerfile | 4 ++-- python3.7/build/Dockerfile | 4 ++-- python3.8/build/Dockerfile | 4 ++-- ruby2.5/build/Dockerfile | 4 ++-- ruby2.7/build/Dockerfile | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dotnetcore2.0/build/Dockerfile b/dotnetcore2.0/build/Dockerfile index 21140dda..01474732 100644 --- a/dotnetcore2.0/build/Dockerfile +++ b/dotnetcore2.0/build/Dockerfile @@ -29,7 +29,7 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 CMD ["dotnet", "build"] diff --git a/dotnetcore2.1/build/Dockerfile b/dotnetcore2.1/build/Dockerfile index 2b314be4..b9aceba7 100644 --- a/dotnetcore2.1/build/Dockerfile +++ b/dotnetcore2.1/build/Dockerfile @@ -30,8 +30,8 @@ RUN source /usr/local/pipx/shared/bin/activate && \ pipx install virtualenv && \ pipx install pipenv && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 && \ + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 3.3.1 CMD ["dotnet", "build"] diff --git a/dotnetcore3.1/build/Dockerfile b/dotnetcore3.1/build/Dockerfile index 18e114ac..5952e362 100644 --- a/dotnetcore3.1/build/Dockerfile +++ b/dotnetcore3.1/build/Dockerfile @@ -25,8 +25,8 @@ RUN curl -L https://dot.net/v1/dotnet-install.sh | bash -s -- -v $DOTNET_SDK_VER # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 && \ + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 && \ dotnet tool install --global Amazon.Lambda.Tools --version 4.0.0 CMD ["dotnet", "build"] diff --git a/go1.x/build/Dockerfile b/go1.x/build/Dockerfile index 7aa4e18b..87ffda03 100644 --- a/go1.x/build/Dockerfile +++ b/go1.x/build/Dockerfile @@ -23,7 +23,7 @@ RUN curl https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.t # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 CMD ["dep", "ensure"] diff --git a/java11/build/Dockerfile b/java11/build/Dockerfile index 3b54f0a4..6b2f3c90 100644 --- a/java11/build/Dockerfile +++ b/java11/build/Dockerfile @@ -19,5 +19,5 @@ ENV PATH="/usr/local/gradle/gradle-6.8.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/java8.al2/build/Dockerfile b/java8.al2/build/Dockerfile index 959d5832..0edeb604 100644 --- a/java8.al2/build/Dockerfile +++ b/java8.al2/build/Dockerfile @@ -22,5 +22,5 @@ ENV PATH="/usr/local/gradle/gradle-6.8.1/bin:/usr/local/maven/apache-maven-3.6.3 # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/java8/build/Dockerfile b/java8/build/Dockerfile index 83c9e60d..25e65cd4 100644 --- a/java8/build/Dockerfile +++ b/java8/build/Dockerfile @@ -22,5 +22,5 @@ ENV PATH="/usr/local/gradle/gradle-6.8.1/bin:/usr/local/maven/apache-maven-3.6.3 # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/nodejs10.x/build/Dockerfile b/nodejs10.x/build/Dockerfile index 31a81f5f..4b7bb8ff 100644 --- a/nodejs10.x/build/Dockerfile +++ b/nodejs10.x/build/Dockerfile @@ -13,5 +13,5 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/nodejs12.x/build/Dockerfile b/nodejs12.x/build/Dockerfile index fcef1c7b..98833ba5 100644 --- a/nodejs12.x/build/Dockerfile +++ b/nodejs12.x/build/Dockerfile @@ -13,5 +13,5 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/nodejs4.3/build/Dockerfile b/nodejs4.3/build/Dockerfile index 8d1c7e8f..c971ca69 100644 --- a/nodejs4.3/build/Dockerfile +++ b/nodejs4.3/build/Dockerfile @@ -16,7 +16,7 @@ COPY --from=0 /var/rapid /var/rapid # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 CMD ["npm", "rebuild"] diff --git a/nodejs6.10/build/Dockerfile b/nodejs6.10/build/Dockerfile index fbfba52a..a544d6f7 100644 --- a/nodejs6.10/build/Dockerfile +++ b/nodejs6.10/build/Dockerfile @@ -16,7 +16,7 @@ COPY --from=0 /var/rapid /var/rapid # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 CMD ["npm", "rebuild"] diff --git a/nodejs8.10/build/Dockerfile b/nodejs8.10/build/Dockerfile index 2191f84e..f87e8a22 100644 --- a/nodejs8.10/build/Dockerfile +++ b/nodejs8.10/build/Dockerfile @@ -16,7 +16,7 @@ COPY --from=0 /var/rapid /var/rapid # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 CMD ["npm", "rebuild"] diff --git a/provided.al2/build/Dockerfile b/provided.al2/build/Dockerfile index aa77a92c..214706da 100644 --- a/provided.al2/build/Dockerfile +++ b/provided.al2/build/Dockerfile @@ -8,5 +8,5 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/provided/build/Dockerfile b/provided/build/Dockerfile index 2c3d392a..47474a12 100644 --- a/provided/build/Dockerfile +++ b/provided/build/Dockerfile @@ -10,5 +10,5 @@ COPY --from=0 /var/rapid /var/rapid # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/python3.6/build/Dockerfile b/python3.6/build/Dockerfile index 439a1c7d..3da42ff5 100644 --- a/python3.6/build/Dockerfile +++ b/python3.6/build/Dockerfile @@ -29,5 +29,5 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install pipenv && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/python3.7/build/Dockerfile b/python3.7/build/Dockerfile index 086e0f6a..98b20835 100644 --- a/python3.7/build/Dockerfile +++ b/python3.7/build/Dockerfile @@ -20,5 +20,5 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install pipenv && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/python3.8/build/Dockerfile b/python3.8/build/Dockerfile index 1049db2b..ecf9ab00 100644 --- a/python3.8/build/Dockerfile +++ b/python3.8/build/Dockerfile @@ -20,5 +20,5 @@ RUN pip install -U pip setuptools wheel --no-cache-dir && \ pipx install pipenv && \ pipx install poetry==1.1.4 && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 diff --git a/ruby2.5/build/Dockerfile b/ruby2.5/build/Dockerfile index 8d783f04..439b202b 100644 --- a/ruby2.5/build/Dockerfile +++ b/ruby2.5/build/Dockerfile @@ -18,7 +18,7 @@ COPY --from=0 /var/rapid /var/rapid # The pipx workaround is due to https://github.com/pipxproject/pipx/issues/218 RUN source /usr/local/pipx/shared/bin/activate && \ pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 && \ + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' diff --git a/ruby2.7/build/Dockerfile b/ruby2.7/build/Dockerfile index fd43b68d..c0fbeef3 100644 --- a/ruby2.7/build/Dockerfile +++ b/ruby2.7/build/Dockerfile @@ -16,7 +16,7 @@ COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently RUN pipx install awscli==1.* && \ - pipx install aws-lambda-builders==1.1.0 && \ - pipx install aws-sam-cli==1.11.0 && \ + pipx install aws-lambda-builders==1.2.0 && \ + pipx install aws-sam-cli==1.15.0 && \ gem update --system --no-document && \ gem install --no-document bundler -v '~> 2.1' From 6c8ddcf78a1d90dd2f26e544885dcbfad9dd0a32 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 09:40:35 -0500 Subject: [PATCH 78/83] Bump base packages --- base/Dockerfile | 2 +- base/base-2/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 6d447adc..c3623a79 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -33,7 +33,7 @@ ENV PATH=/usr/local/bin:/usr/bin/:/bin:/opt/bin \ # pam has problems reinstalling from a non-standard installroot, # so reinstall everything except filesystem here RUN yum reinstall -y setup-2.8.14-20.12.amzn1 audit-libs-2.6.5-3.28.amzn1 shadow-utils-4.1.4.2-13.10.amzn1 \ - openssl-1.0.2k-16.151.amzn1 glibc-2.17-292.180.amzn1 glibc-common-2.17-292.180.amzn1 pam-1.1.8-12.33.amzn1 && \ + openssl-1.0.2k-16.152.amzn1 glibc-2.17-292.180.amzn1 glibc-common-2.17-292.180.amzn1 pam-1.1.8-12.33.amzn1 && \ yum clean all && \ chown sbx_user1051:495 /tmp && \ chmod 700 /tmp diff --git a/base/base-2/Dockerfile b/base/base-2/Dockerfile index 42ca14d7..6f41cc31 100644 --- a/base/base-2/Dockerfile +++ b/base/base-2/Dockerfile @@ -6,7 +6,7 @@ FROM amazonlinux:2 ADD ./base-2.tgz /opt/ RUN yum --installroot=/opt reinstall -y filesystem-3.2-25.amzn2.0.4 \ - setup-2.8.71-10.amzn2.0.1 glibc-2.26-37.amzn2 glibc-common-2.26-38.amzn2 && \ + setup-2.8.71-10.amzn2.0.1 glibc-2.26-39.amzn2 glibc-common-2.26-39.amzn2 && \ yum --installroot=/opt clean all FROM scratch From 39e8d0d57fa2cdce5d955e41e7e979e8ac24c142 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 09:59:51 -0500 Subject: [PATCH 79/83] Ensure we only use a 2.7-compatible pip for python2.7 --- python2.7/build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python2.7/build/Dockerfile b/python2.7/build/Dockerfile index 826024bd..520142fd 100644 --- a/python2.7/build/Dockerfile +++ b/python2.7/build/Dockerfile @@ -9,7 +9,7 @@ COPY --from=0 /var/lang /var/lang COPY --from=0 /var/rapid /var/rapid # Add these as a separate layer as they get updated frequently -RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/get-pip.py | python && \ +RUN curl --silent --show-error --retry 5 https://bootstrap.pypa.io/2.7/get-pip.py | python && \ pip install -U 'virtualenv>=16.0.0,<20.0.0' pipenv wheel --no-cache-dir && \ curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/1.1.4/get-poetry.py | POETRY_VERSION=1.1.4 python && \ pip install -U awscli boto3 aws-sam-cli==0.22.0 aws-lambda-builders==0.4.0 --no-cache-dir From 34dc45175525d8f11d150998883fce4fd47ed33b Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 15:59:22 -0500 Subject: [PATCH 80/83] Cleanup unnecessary go code --- provided/run/init.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/provided/run/init.go b/provided/run/init.go index 6b9339c2..f594f297 100644 --- a/provided/run/init.go +++ b/provided/run/init.go @@ -43,10 +43,10 @@ var watchMode = os.Getenv("DOCKER_LAMBDA_WATCH") != "" var curState = "STATE_INIT" var transitions = map[string]map[string]bool{ - "STATE_INIT_ERROR": map[string]bool{"STATE_INIT": true}, - "STATE_INVOKE_NEXT": map[string]bool{"STATE_INIT": true, "STATE_INVOKE_NEXT": true, "STATE_INVOKE_RESPONSE": true, "STATE_INVOKE_ERROR": true}, - "STATE_INVOKE_RESPONSE": map[string]bool{"STATE_INVOKE_NEXT": true}, - "STATE_INVOKE_ERROR": map[string]bool{"STATE_INVOKE_NEXT": true}, + "STATE_INIT_ERROR": {"STATE_INIT": true}, + "STATE_INVOKE_NEXT": {"STATE_INIT": true, "STATE_INVOKE_NEXT": true, "STATE_INVOKE_RESPONSE": true, "STATE_INVOKE_ERROR": true}, + "STATE_INVOKE_RESPONSE": {"STATE_INVOKE_NEXT": true}, + "STATE_INVOKE_ERROR": {"STATE_INVOKE_NEXT": true}, } var acceptedResponse = &statusResponse{Status: "OK", HTTPStatusCode: 202} From a71b6d72ab9d3b5aed0d1f81cccd6f7859196df1 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Fri, 29 Jan 2021 15:59:37 -0500 Subject: [PATCH 81/83] Remove unused dotnet code --- dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs | 5 ----- dotnetcore2.1/run/MockBootstraps/MockLambdaContext.cs | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs b/dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs index 1a3d6797..76d64ca8 100644 --- a/dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs +++ b/dotnetcore2.0/run/MockBootstraps/MockLambdaContext.cs @@ -42,9 +42,6 @@ public TimeSpan RemainingTime() return StartTime + TimeSpan.FromSeconds(Timeout) - DateTime.Now; } - public long Duration => (long)(DateTime.Now - StartTime).TotalMilliseconds; - public long BilledDuration => (long)(Math.Ceiling((DateTime.Now - StartTime).TotalMilliseconds / 100)) * 100; - public long DeadlineMs { set @@ -64,8 +61,6 @@ public string Body } } - public long MemoryUsed => Process.GetCurrentProcess().WorkingSet64; - public Stream InputStream { get; set; } public string RequestId { get; set; } diff --git a/dotnetcore2.1/run/MockBootstraps/MockLambdaContext.cs b/dotnetcore2.1/run/MockBootstraps/MockLambdaContext.cs index 1a3d6797..76d64ca8 100644 --- a/dotnetcore2.1/run/MockBootstraps/MockLambdaContext.cs +++ b/dotnetcore2.1/run/MockBootstraps/MockLambdaContext.cs @@ -42,9 +42,6 @@ public TimeSpan RemainingTime() return StartTime + TimeSpan.FromSeconds(Timeout) - DateTime.Now; } - public long Duration => (long)(DateTime.Now - StartTime).TotalMilliseconds; - public long BilledDuration => (long)(Math.Ceiling((DateTime.Now - StartTime).TotalMilliseconds / 100)) * 100; - public long DeadlineMs { set @@ -64,8 +61,6 @@ public string Body } } - public long MemoryUsed => Process.GetCurrentProcess().WorkingSet64; - public Stream InputStream { get; set; } public string RequestId { get; set; } From eca75c1c0d096955eb3f400e85703889dff4f4c9 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Mon, 16 Jan 2023 08:08:44 +1100 Subject: [PATCH 82/83] Add deprecation note --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index bb211d1f..9de871c9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +# Deprecated + +NB: these images are deprecated in favor of AWS' official Lambda Runtime Interface Emulator, which you can find at: + +https://github.com/aws/aws-lambda-runtime-interface-emulator + +This project is now archived and will not receive any further updates. + # docker-lambda A sandboxed local environment that replicates the live [AWS Lambda](https://aws.amazon.com/lambda/) From de9a2bf5b73f6330fff10e0203f94b9f6f784ab6 Mon Sep 17 00:00:00 2001 From: Michael Hart Date: Sun, 15 Jan 2023 16:14:40 -0500 Subject: [PATCH 83/83] Use different AWS repo (#368) --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9de871c9..136a5ff2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ # Deprecated -NB: these images are deprecated in favor of AWS' official Lambda Runtime Interface Emulator, which you can find at: +NB: these images are deprecated in favor of AWS' official images, which you can find at: -https://github.com/aws/aws-lambda-runtime-interface-emulator +https://github.com/aws/aws-lambda-base-images + +And browse on the ECR public gallery, eg: + +https://gallery.ecr.aws/lambda/python This project is now archived and will not receive any further updates.