From ad529a67bb9f580dd523f9417b4e8b7c175f06aa Mon Sep 17 00:00:00 2001
From: Colin Nelson <colnnelson@google.com>
Date: Tue, 25 Sep 2018 12:04:53 -0700
Subject: [PATCH] emailservice: Updated to python 3, streamlined pip install.
 Image size is now ~271MB

---
 src/emailservice/Dockerfile       | 15 ++++-----------
 src/emailservice/requirements.txt |  5 +++--
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/emailservice/Dockerfile b/src/emailservice/Dockerfile
index d636572..88f1a2f 100644
--- a/src/emailservice/Dockerfile
+++ b/src/emailservice/Dockerfile
@@ -1,8 +1,8 @@
-FROM python:2.7-alpine3.8 as base
+FROM python:3.7.0-alpine3.8 as base
 
 FROM base as builder
 
-# gRPC deps
+# gRPC and app deps
 RUN apk add --update --no-cache \
     gcc \
     linux-headers \
@@ -10,23 +10,16 @@ RUN apk add --update --no-cache \
     musl-dev \
     python-dev \
     g++ \
+    # App Deps
     cairo-dev \
     cairo \
     openssl-dev \ 
     gobject-introspection-dev
 
-ENV GRPC_PYTHON_VERSION 1.15.0
-
-# Install grpcio
-RUN python -m pip install --upgrade pip
-RUN pip install grpcio==${GRPC_PYTHON_VERSION} grpcio-tools==${GRPC_PYTHON_VERSION}
-
 # get packages
 COPY requirements.txt .
-
 RUN pip install -r requirements.txt
 
-
 FROM base as final
 
 # Download the grpc health probe
@@ -40,7 +33,7 @@ ENV PYTHONUNBUFFERED=0
 WORKDIR /email_server
 
 # Grab packages from builder
-COPY --from=builder /usr/local/lib/python2.7/ /usr/local/lib/python2.7/
+COPY --from=builder /usr/local/lib/python3.7/ /usr/local/lib/python3.7/
 
 # Need libstdc++ for grpc
 RUN apk add --no-cache libstdc++
diff --git a/src/emailservice/requirements.txt b/src/emailservice/requirements.txt
index f186bdf..42eea29 100644
--- a/src/emailservice/requirements.txt
+++ b/src/emailservice/requirements.txt
@@ -7,7 +7,7 @@ configparser==3.5.0
 cryptography==2.3.1
 entrypoints==0.2.3
 enum34==1.1.6
-futures==3.2.0
+futures==3.1.1
 google-api-core==1.4.0
 google-auth==1.5.1
 google-cloud-core==0.28.1
@@ -19,6 +19,7 @@ grpcio-health-checking==1.15.0
 grpcio-tools==1.15.0
 idna==2.7
 ipaddress==1.0.22
+jeepney==0.4
 Jinja2==2.10
 keyring==15.1.0
 keyrings.alt==3.1
@@ -35,6 +36,6 @@ pytz==2018.5
 pyxdg==0.26
 requests==2.19.1
 rsa==4.0
-SecretStorage==2.3.1
+SecretStorage==3.1.0
 six==1.11.0
 urllib3==1.23
\ No newline at end of file