From ce3cc76e250c17a638b82a67e6f8858b19aa0fdd Mon Sep 17 00:00:00 2001
From: Jez Cope <j.s.cope@sheffield.ac.uk>
Date: Tue, 7 Nov 2017 14:52:25 +0000
Subject: [PATCH] Install s3cmd using pipenv to get latest version

---
 Dockerfile   |  2 +-
 Pipfile      |  1 +
 Pipfile.lock | 21 +++++++++++++++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 36dc2bb..ab74641 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM python:3.6-stretch
 
-RUN apt-get update && apt-get install -y pandoc node-less locales s3cmd awscli
+RUN apt-get update && apt-get install -y pandoc node-less locales awscli
 RUN echo 'en_GB.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
 RUN pip install pipenv
 COPY Pipfile Pipfile.lock /tmp/build/
diff --git a/Pipfile b/Pipfile
index 91825c5..3d3cf59 100644
--- a/Pipfile
+++ b/Pipfile
@@ -12,3 +12,4 @@ typogrify = "*"
 nikola = "*"
 "jinja2" = "*"
 notebook = "*"
+"s3cmd" = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index 22d122c..e581712 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "1d7e46f7d0e4f09aa323be968fc9e6e3ed53b80aeb8f5035ac5a3f85033ad56a"
+            "sha256": "42ac71177d1abf96d8fd30631dfef13f03e86a3e85a2393aceb8215710180b5d"
         },
         "host-environment-markers": {
             "implementation_name": "cpython",
@@ -236,10 +236,10 @@
         },
         "mistune": {
             "hashes": [
-                "sha256:78f5d7f4850c0df94aeec64f994bb8390ca0bc717034bff8d63452815695f02f",
-                "sha256:dc3f43e7cf0abb95cdfecbf82d85c419108d5f13e1844b2a8a2fc0abf24c7a47"
+                "sha256:511f11b307b061136b2aaa99854fa078d688c79426ee9c5857ba784f7a2fad40",
+                "sha256:4c0f66924ce28f03b95b210ea57e57bd0b59f479edd91c2fa4fe59331eae4a82"
             ],
-            "version": "==0.8"
+            "version": "==0.8.1"
         },
         "natsort": {
             "hashes": [
@@ -416,6 +416,13 @@
             ],
             "version": "==2.6.1"
         },
+        "python-magic": {
+            "hashes": [
+                "sha256:a1ec69e76cc513b1af164c02982607f96ff3bb668162a688f2b1bb5f6a5fe05d",
+                "sha256:604eace6f665809bebbb07070508dfa8cabb2d7cb05be9a56706c60f864f1289"
+            ],
+            "version": "==0.4.13"
+        },
         "pyyaml": {
             "hashes": [
                 "sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f",
@@ -470,6 +477,12 @@
             ],
             "version": "==2.18.4"
         },
+        "s3cmd": {
+            "hashes": [
+                "sha256:caf09f1473301c442fba6431c983c361c9af8bde503dac0953f0d2f8f2c53c8f"
+            ],
+            "version": "==2.0.1"
+        },
         "simplegeneric": {
             "hashes": [
                 "sha256:dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"