From fec0fb9e9fd90f94de1efbe74d1a0a919d1a2e55 Mon Sep 17 00:00:00 2001
From: Chris Douglas <chris_douglas@apple.com>
Date: Fri, 17 Dec 2021 11:12:54 -0800
Subject: [PATCH 1/2] Move awscli to base image from YCSB

---
 packaging/docker/Dockerfile.eks | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index a599b49fb7..1d6cee1e08 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -53,6 +53,19 @@ RUN curl -Ls https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd6
     mv tini /usr/bin/ && \
     rm -rf /tmp/*
 
+WORKDIR /tmp
+RUN curl -Ls https://amazon-eks.s3.amazonaws.com/1.19.6/2021-01-05/bin/linux/amd64/kubectl -o kubectl && \
+    echo "08ff68159bbcb844455167abb1d0de75bbfe5ae1b051f81ab060a1988027868a  kubectl" > kubectl.txt && \
+    sha256sum --quiet -c kubectl.txt && \
+    mv kubectl /usr/local/bin/kubectl && \
+    chmod 755 /usr/local/bin/kubectl && \
+    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.2.43.zip -o "awscliv2.zip" && \
+    echo "9a8b3c4e7f72bbcc55e341dce3af42479f2730c225d6d265ee6f9162cfdebdfd  awscliv2.zip" > awscliv2.txt && \
+    sha256sum --quiet -c awscliv2.txt && \
+    unzip -qq awscliv2.zip && \
+    ./aws/install && \
+    rm -rf /tmp/*
+
 WORKDIR /
 
 FROM golang:1.16.7-bullseye AS go-build
@@ -168,19 +181,6 @@ RUN yum -y install \
     yum clean all && \
     rm -rf /var/cache/yum
 
-WORKDIR /tmp
-RUN curl -Ls https://amazon-eks.s3.amazonaws.com/1.19.6/2021-01-05/bin/linux/amd64/kubectl -o kubectl && \
-    echo "08ff68159bbcb844455167abb1d0de75bbfe5ae1b051f81ab060a1988027868a  kubectl" > kubectl.txt && \
-    sha256sum --quiet -c kubectl.txt && \
-    mv kubectl /usr/local/bin/kubectl && \
-    chmod 755 /usr/local/bin/kubectl && \
-    curl -Ls https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.2.43.zip -o "awscliv2.zip" && \
-    echo "9a8b3c4e7f72bbcc55e341dce3af42479f2730c225d6d265ee6f9162cfdebdfd  awscliv2.zip" > awscliv2.txt && \
-    sha256sum --quiet -c awscliv2.txt && \
-    unzip -qq awscliv2.zip && \
-    ./aws/install && \
-    rm -rf /tmp/*
-
 # TODO: Log4J complains that it's eating the HTracer logs.  Even without it, we get per-operation
 # time series graphs of throughput, median, 90, 99, 99.9 and 99.99 (in usec).
 ADD run_ycsb.sh /usr/local/bin/run_ycsb.sh

From 3793e4e5f00a6549eea9c022d3ff38eeeac6c005 Mon Sep 17 00:00:00 2001
From: Chris Douglas <chris_douglas@apple.com>
Date: Fri, 17 Dec 2021 11:34:32 -0800
Subject: [PATCH 2/2] Remove rundant WORKDIR directive

---
 packaging/docker/Dockerfile.eks | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packaging/docker/Dockerfile.eks b/packaging/docker/Dockerfile.eks
index 1d6cee1e08..165d1425b0 100644
--- a/packaging/docker/Dockerfile.eks
+++ b/packaging/docker/Dockerfile.eks
@@ -53,7 +53,6 @@ RUN curl -Ls https://github.com/krallin/tini/releases/download/v0.19.0/tini-amd6
     mv tini /usr/bin/ && \
     rm -rf /tmp/*
 
-WORKDIR /tmp
 RUN curl -Ls https://amazon-eks.s3.amazonaws.com/1.19.6/2021-01-05/bin/linux/amd64/kubectl -o kubectl && \
     echo "08ff68159bbcb844455167abb1d0de75bbfe5ae1b051f81ab060a1988027868a  kubectl" > kubectl.txt && \
     sha256sum --quiet -c kubectl.txt && \