From 8141999aecba3ee39d7d85e81aae1700b6264cfa Mon Sep 17 00:00:00 2001
From: "summer.gan" <summer.gan@ringcentral.com>
Date: Sun, 9 Oct 2022 15:07:07 +0800
Subject: [PATCH 1/2] update

---
 images/Dockerfile.aws-cli | 67 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/images/Dockerfile.aws-cli b/images/Dockerfile.aws-cli
index 9633463..6532a43 100644
--- a/images/Dockerfile.aws-cli
+++ b/images/Dockerfile.aws-cli
@@ -1,4 +1,69 @@
-FROM mhart/alpine-node:14
+# FROM mhart/alpine-node:14
+FROM alpine:3.7
+ENV VERSION=v14.20.0 NPM_VERSION=6 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python
+
+# FROM alpine:3.9
+# ENV VERSION=v12.22.3 NPM_VERSION=6 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python
+
+# FROM alpine:3.11
+# ENV VERSION=v14.17.3 NPM_VERSION=6 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python3
+
+# FROM alpine:3.13
+# ENV VERSION=v16.4.2 NPM_VERSION=7 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python3
+
+RUN apk upgrade --no-cache -U && \
+  apk add --no-cache curl make gcc g++ ${NODE_BUILD_PYTHON} linux-headers binutils-gold gnupg libstdc++
+
+RUN for server in hkps://keys.openpgp.org ipv4.pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
+    gpg --keyserver $server --recv-keys \
+      4ED778F539E3634C779C87C6D7062848A1AB005C \
+      94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
+      74F12602B6F1C4E913FAA37AD3A89613643B6201 \
+      71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
+      8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
+      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
+      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
+      A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
+      108F52B48DB57BB0CC439B2997B01419BD92F80A \
+      B9E2F5981AA6E0CD28160D9FF13993A75599653C && break; \
+  done
+
+RUN curl -sfSLO https://nodejs.org/dist/${VERSION}/node-${VERSION}.tar.xz && \
+  curl -sfSL https://nodejs.org/dist/${VERSION}/SHASUMS256.txt.asc | gpg -d -o SHASUMS256.txt && \
+  grep " node-${VERSION}.tar.xz\$" SHASUMS256.txt | sha256sum -c | grep ': OK$' && \
+  tar -xf node-${VERSION}.tar.xz && \
+  cd node-${VERSION} && \
+  ./configure --prefix=/usr ${CONFIG_FLAGS} && \
+  make -j$(getconf _NPROCESSORS_ONLN) && \
+  make install
+
+RUN if [ -z "$CONFIG_FLAGS" ]; then \
+    if [ -n "$NPM_VERSION" ]; then \
+      npm install -g npm@${NPM_VERSION}; \
+    fi; \
+    find /usr/lib/node_modules/npm -type d \( -name test -o -name .bin \) | xargs rm -rf; \
+    if [ -n "$YARN_VERSION" ]; then \
+      for server in hkps://keys.openpgp.org ipv4.pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
+        gpg --keyserver $server --recv-keys \
+          6A010C5166006599AA17F08146C2130DFD2497F5 && break; \
+      done && \
+      curl -sfSL -O https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz -O https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz.asc && \
+      gpg --batch --verify yarn-${YARN_VERSION}.tar.gz.asc yarn-${YARN_VERSION}.tar.gz && \
+      mkdir /usr/local/share/yarn && \
+      tar -xf yarn-${YARN_VERSION}.tar.gz -C /usr/local/share/yarn --strip 1 && \
+      ln -s /usr/local/share/yarn/bin/yarn /usr/local/bin/ && \
+      ln -s /usr/local/share/yarn/bin/yarnpkg /usr/local/bin/ && \
+      rm yarn-${YARN_VERSION}.tar.gz*; \
+    fi; \
+  fi
+
+RUN apk del curl make gcc g++ ${NODE_BUILD_PYTHON} linux-headers binutils-gold gnupg ${DEL_PKGS} && \
+  rm -rf ${RM_DIRS} /node-${VERSION}* /SHASUMS256.txt /tmp/* \
+    /usr/share/man/* /usr/share/doc /root/.npm /root/.node-gyp /root/.config \
+    /usr/lib/node_modules/npm/man /usr/lib/node_modules/npm/doc /usr/lib/node_modules/npm/docs \
+    /usr/lib/node_modules/npm/html /usr/lib/node_modules/npm/scripts && \
+  { rm -rf /root/.gnupg || true; }
 
 RUN apk -v --update add \
         bash \

From e0d21e2c5d56cf326da1750860550785b157fdb5 Mon Sep 17 00:00:00 2001
From: "summer.gan" <summer.gan@ringcentral.com>
Date: Mon, 10 Oct 2022 14:19:00 +0800
Subject: [PATCH 2/2] update:update

---
 images/Dockerfile.aws-cli | 70 ++-------------------------------------
 1 file changed, 2 insertions(+), 68 deletions(-)

diff --git a/images/Dockerfile.aws-cli b/images/Dockerfile.aws-cli
index 6532a43..3ea1275 100644
--- a/images/Dockerfile.aws-cli
+++ b/images/Dockerfile.aws-cli
@@ -1,79 +1,13 @@
-# FROM mhart/alpine-node:14
-FROM alpine:3.7
-ENV VERSION=v14.20.0 NPM_VERSION=6 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python
-
-# FROM alpine:3.9
-# ENV VERSION=v12.22.3 NPM_VERSION=6 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python
-
-# FROM alpine:3.11
-# ENV VERSION=v14.17.3 NPM_VERSION=6 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python3
-
-# FROM alpine:3.13
-# ENV VERSION=v16.4.2 NPM_VERSION=7 YARN_VERSION=v1.22.10 NODE_BUILD_PYTHON=python3
-
-RUN apk upgrade --no-cache -U && \
-  apk add --no-cache curl make gcc g++ ${NODE_BUILD_PYTHON} linux-headers binutils-gold gnupg libstdc++
-
-RUN for server in hkps://keys.openpgp.org ipv4.pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
-    gpg --keyserver $server --recv-keys \
-      4ED778F539E3634C779C87C6D7062848A1AB005C \
-      94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-      74F12602B6F1C4E913FAA37AD3A89613643B6201 \
-      71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
-      8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
-      C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
-      C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
-      DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-      A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
-      108F52B48DB57BB0CC439B2997B01419BD92F80A \
-      B9E2F5981AA6E0CD28160D9FF13993A75599653C && break; \
-  done
-
-RUN curl -sfSLO https://nodejs.org/dist/${VERSION}/node-${VERSION}.tar.xz && \
-  curl -sfSL https://nodejs.org/dist/${VERSION}/SHASUMS256.txt.asc | gpg -d -o SHASUMS256.txt && \
-  grep " node-${VERSION}.tar.xz\$" SHASUMS256.txt | sha256sum -c | grep ': OK$' && \
-  tar -xf node-${VERSION}.tar.xz && \
-  cd node-${VERSION} && \
-  ./configure --prefix=/usr ${CONFIG_FLAGS} && \
-  make -j$(getconf _NPROCESSORS_ONLN) && \
-  make install
-
-RUN if [ -z "$CONFIG_FLAGS" ]; then \
-    if [ -n "$NPM_VERSION" ]; then \
-      npm install -g npm@${NPM_VERSION}; \
-    fi; \
-    find /usr/lib/node_modules/npm -type d \( -name test -o -name .bin \) | xargs rm -rf; \
-    if [ -n "$YARN_VERSION" ]; then \
-      for server in hkps://keys.openpgp.org ipv4.pool.sks-keyservers.net keyserver.pgp.com ha.pool.sks-keyservers.net; do \
-        gpg --keyserver $server --recv-keys \
-          6A010C5166006599AA17F08146C2130DFD2497F5 && break; \
-      done && \
-      curl -sfSL -O https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz -O https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz.asc && \
-      gpg --batch --verify yarn-${YARN_VERSION}.tar.gz.asc yarn-${YARN_VERSION}.tar.gz && \
-      mkdir /usr/local/share/yarn && \
-      tar -xf yarn-${YARN_VERSION}.tar.gz -C /usr/local/share/yarn --strip 1 && \
-      ln -s /usr/local/share/yarn/bin/yarn /usr/local/bin/ && \
-      ln -s /usr/local/share/yarn/bin/yarnpkg /usr/local/bin/ && \
-      rm yarn-${YARN_VERSION}.tar.gz*; \
-    fi; \
-  fi
-
-RUN apk del curl make gcc g++ ${NODE_BUILD_PYTHON} linux-headers binutils-gold gnupg ${DEL_PKGS} && \
-  rm -rf ${RM_DIRS} /node-${VERSION}* /SHASUMS256.txt /tmp/* \
-    /usr/share/man/* /usr/share/doc /root/.npm /root/.node-gyp /root/.config \
-    /usr/lib/node_modules/npm/man /usr/lib/node_modules/npm/doc /usr/lib/node_modules/npm/docs \
-    /usr/lib/node_modules/npm/html /usr/lib/node_modules/npm/scripts && \
-  { rm -rf /root/.gnupg || true; }
+FROM node:14.20-alpine3.15
 
 RUN apk -v --update add \
         bash \
-        python \
         py-pip \
         groff \
         less \
         mailcap \
         && \
-    pip install --upgrade awscli==1.16.88 s3cmd==2.0.1 python-magic && \
+    pip install --upgrade awscli s3cmd python-magic && \
     apk -v --purge del py-pip && \
     rm /var/cache/apk/*