From 7b20318ee4bc143eb60aa4276f6427212b75eb44 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 19 Dec 2018 12:57:34 -0800
Subject: [PATCH] Run s3cmd in a container to avoid additional CI system
 dependencies

---
 ci/publish-bpf-sdk.sh    | 14 +++++++-------
 ci/publish-solana-tar.sh | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ci/publish-bpf-sdk.sh b/ci/publish-bpf-sdk.sh
index 59913a0b96..080c98e15d 100755
--- a/ci/publish-bpf-sdk.sh
+++ b/ci/publish-bpf-sdk.sh
@@ -25,13 +25,13 @@ if [[ -z $CHANNEL ]]; then
 else
   (
     set -x
-    if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then
-      rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1
-      wget https://github.com/s3tools/s3cmd/releases/download/v2.0.1/s3cmd-2.0.1.tar.gz
-      tar zxf s3cmd-2.0.1.tar.gz
-    fi
-
-    python ./s3cmd-2.0.1/s3cmd --acl-public put bpf-sdk.tar.bz2 \
+    docker run \
+      --rm \
+      --env AWS_ACCESS_KEY_ID \
+      --env AWS_SECRET_ACCESS_KEY \
+      --volume "$PWD:/solana" \
+      eremite/aws-cli:2018.12.18 \
+      /usr/bin/s3cmd --acl-public put /solana/bpf-sdk.tar.bz2 \
       s3://solana-sdk/"$CHANNEL"/bpf-sdk.tar.bz2
   )
 fi
diff --git a/ci/publish-solana-tar.sh b/ci/publish-solana-tar.sh
index 9de2ad441c..a305ce8695 100755
--- a/ci/publish-solana-tar.sh
+++ b/ci/publish-solana-tar.sh
@@ -69,13 +69,13 @@ fi
 echo --- AWS S3 Store
 (
   set -x
-  if [[ ! -r s3cmd-2.0.1/s3cmd ]]; then
-    rm -rf s3cmd-2.0.1.tar.gz s3cmd-2.0.1
-    $DRYRUN wget https://github.com/s3tools/s3cmd/releases/download/v2.0.1/s3cmd-2.0.1.tar.gz
-    $DRYRUN tar zxf s3cmd-2.0.1.tar.gz
-  fi
-
-  $DRYRUN python ./s3cmd-2.0.1/s3cmd --acl-public put solana-release.tar.bz2 \
+  $DRYRUN docker run \
+    --rm \
+    --env AWS_ACCESS_KEY_ID \
+    --env AWS_SECRET_ACCESS_KEY \
+    --volume "$PWD:/solana" \
+    eremite/aws-cli:2018.12.18 \
+    /usr/bin/s3cmd --acl-public put /solana/solana-release.tar.bz2 \
     s3://solana-release/"$CHANNEL_OR_TAG"/solana-release.tar.bz2
 
   echo Published to: