From 466176c7175c6eaf3e30843a95438ef71669b373 Mon Sep 17 00:00:00 2001
From: Brian Zambrano <brianz@gmail.com>
Date: Fri, 6 Apr 2018 11:29:47 -0600
Subject: [PATCH] Bump versions of Python, SLS and yarn

Why
---

- Updating to the latest and greatest of everything

This change addresses the need by
---------------------------------

- Bumping base versions of Python 2 and 3 images
- Bumping version of Serverless
- Bumping version of Yarn
- Updating README
---
 Dockerfile         |  2 +-
 Dockerfile-python3 |  2 +-
 Makefile           |  4 ++--
 README.md          | 13 +++++++++++--
 hooks/build        |  4 ++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a70550d..9470144 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2.7.13
+FROM python:2.7.14
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN apt-get install -y \
diff --git a/Dockerfile-python3 b/Dockerfile-python3
index 40d966f..8ace9af 100644
--- a/Dockerfile-python3
+++ b/Dockerfile-python3
@@ -1,4 +1,4 @@
-FROM python:3.6.2
+FROM python:3.6.5
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN apt-get install -y \
diff --git a/Makefile b/Makefile
index 1e0f300..25868b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 NAME = verypossible/serverless
-VERSION = 1.25.0
+VERSION = 1.26.1
 SERVERLESS_VERSION = $(VERSION)
-YARN_VERSION = 1.3.2
+YARN_VERSION = 1.5.1
 
 .PHONY:	all py2 py3 shell
 
diff --git a/README.md b/README.md
index 95d508b..4246c70 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,19 @@ using `--build-arg` during the `docker build` command.  To pass this
 argument, we need a Docker Cloud build hook which resides in
 `hooks/build`.
 
+# Instructions for updating versions
+
 In order to bump the Serverless version, the only real requirement is
 to change the version in the `hooks/build` file.  The `Makefile` also
-has references to the Serverless version, but this is really for
-testing the build locally.
+has references to the Serverless version, _but this is really for
+testing the build locally_.
+
+My workflow is usually:
+
+- Update versions in `Makefile` and run `make build`
+- If the build works, update the versions in `hooks/build`
+- Create PR
+- On merge to `master`, Docker Hub will do the builds automatically.
 
 See the following for more information on Docker Cloud build hooks:
 
diff --git a/hooks/build b/hooks/build
index fe58e3a..bf1cadd 100755
--- a/hooks/build
+++ b/hooks/build
@@ -10,7 +10,7 @@ fi
 echo "Using $DOCKERFILE for build"
 
 docker build \
-        --build-arg SERVERLESS_VERSION=1.25.0 \
-        --build-arg YARN_VERSION=1.3.2 \
+        --build-arg SERVERLESS_VERSION=1.26.1 \
+        --build-arg YARN_VERSION=1.5.1 \
         -f $DOCKERFILE \
         -t $IMAGE_NAME .