From 1b8f97c52e78f09bfafaa075ceed529b3b69db85 Mon Sep 17 00:00:00 2001
From: David Heiman <dheiman@broadinstitute.org>
Date: Wed, 30 May 2018 15:28:13 -0400
Subject: [PATCH] Release Candidate v0.16.12

* Removed gcloud requirement from README (automatic as of v0.16.11)
* Updated Dockerfile and added .dockerignore
---
 .dockerignore          |  2 ++
 Dockerfile             | 11 +++++++----
 README                 |  6 ------
 changelog.txt          |  3 +++
 firecloud/__about__.py |  2 +-
 firecloud/api.py       |  1 +
 setup.py               |  2 +-
 7 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..5d0f124
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
diff --git a/Dockerfile b/Dockerfile
index 40a1f84..c5ced8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,8 @@
-FROM python:2.7.11
+FROM python:2.7.15-slim
 
-RUN apt-get update && apt-get install -y curl
-RUN pip install firecloud
-RUN curl https://sdk.cloud.google.com | bash
+RUN set -ex \
+    && apt-get update && apt-get install -y --no-install-recommends curl \
+    && rm -rf /var/lib/apt/lists/* \
+    && pip install --no-cache-dir -U --upgrade-strategy eager firecloud
+
+CMD ["fissfc"]
\ No newline at end of file
diff --git a/README b/README
index c020e04..f19461f 100644
--- a/README
+++ b/README
@@ -59,12 +59,6 @@ FISS depends on several additional Python software packages, as listed in
 setup.py; typically the entire installation process (including loading of
 packages) takes only a few minutes.
 
-FireCloud uses the Google Cloud SDK (https://cloud.google.com/sdk/) to manage
-authorization. To use the firecloud CLI or API, you must install the SDK and
-login locally with
-
-    gcloud auth application-default login
-
 **Note: FireCloud encryts all web traffic with TLSv1.2. Some versions of
 python will not function correctly, and must be recompiled with openssl
 v1.02 or later. If recompiling is not an option, there is also a
diff --git a/changelog.txt b/changelog.txt
index dca7be9..b3db9bd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,9 @@ Change Log for FISSFC: the (Fi)recloud (S)ervice (S)elector
 =======================================================================
 Terms used below:  HL = high level interface, LL = low level interface
 
+v0.16.12 - Removed gcloud requirement from README (automatic as of v0.16.11);
+           Updated Dockerfile and added .dockerignore
+
 v0.16.11 - On install, will install gcloud if not available and not running in
            Google AppEngine; Now attempts to set authentication credentials if
            they have not been set; Added license; Added new LL functions:
diff --git a/firecloud/__about__.py b/firecloud/__about__.py
index 98d6cc5..d8bef71 100644
--- a/firecloud/__about__.py
+++ b/firecloud/__about__.py
@@ -1,2 +1,2 @@
 # Package version
-__version__ = "0.16.11"
+__version__ = "0.16.12"
diff --git a/firecloud/api.py b/firecloud/api.py
index 1049411..88ec13c 100755
--- a/firecloud/api.py
+++ b/firecloud/api.py
@@ -9,6 +9,7 @@
 from __future__ import print_function
 import json
 import sys
+import os
 import io
 import logging
 import subprocess
diff --git a/setup.py b/setup.py
index 26e602a..ebd34e5 100644
--- a/setup.py
+++ b/setup.py
@@ -154,4 +154,4 @@ def run(self):
 
     ],
 
-)
\ No newline at end of file
+)