Merge pull request #24 from verypossible/update-to-1.27

Bump versions and set default to python3

Author: brianz

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:2.7.14
+FROM python:3.6.5
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN apt-get install -y \

Dockerfile-python3 Dockerfile-python2

@@ -1,4 +1,4 @@
-FROM python:3.6.5
+FROM python:2.7.14
 
 RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
 RUN apt-get install -y \
@@ -20,7 +20,7 @@ RUN pip install \
 
 ARG SERVERLESS_VERSION
 RUN npm install -g \
-    serverless@${SERVERLESS_VERSION} 
+    serverless@${SERVERLESS_VERSION}
 
 ARG YARN_VERSION
 RUN curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version ${YARN_VERSION}

Makefile

@@ -1,7 +1,7 @@
 NAME = verypossible/serverless
-VERSION = 1.26.1
+VERSION = 1.27.2
 SERVERLESS_VERSION = $(VERSION)
-YARN_VERSION = 1.5.1
+YARN_VERSION = 1.6.0
 
 .PHONY:	all py2 py3 shell
 
@@ -10,21 +10,22 @@ all : py2 py3
 
 py2 :
 	docker build \
-		-t $(NAME):$(VERSION) \
+		-t $(NAME):$(VERSION)-python2 \
+		-f Dockerfile-python2 \
 		--build-arg SERVERLESS_VERSION=$(SERVERLESS_VERSION) \
 		--build-arg YARN_VERSION=$(YARN_VERSION) \
 		.
 
 py3 :
 	docker build \
-		-t $(NAME):$(VERSION)-python3 \
-		-f Dockerfile-python3 \
+		-t $(NAME):$(VERSION) \
+		-f Dockerfile \
 		--build-arg SERVERLESS_VERSION=$(SERVERLESS_VERSION) \
 		--build-arg YARN_VERSION=$(YARN_VERSION) \
 		.
 
 py2-shell :
-	docker run --rm -it $(NAME):$(VERSION) bash
+	docker run --rm -it $(NAME):$(VERSION)-python2 bash
 
 py3-shell :
-	docker run --rm -it $(NAME):$(VERSION)-python3 bash
+	docker run --rm -it $(NAME):$(VERSION) bash

hooks/build

@@ -3,14 +3,14 @@ DOCKERFILE=Dockerfile
 
 echo "Building $CACHE_TAG using build hook!"
 
-if [[ $CACHE_TAG == *"python3"* ]]; then
-    DOCKERFILE=Dockerfile-python3
+if [[ $CACHE_TAG == *"python2"* ]]; then
+    DOCKERFILE=Dockerfile-python2
 fi
 
 echo "Using $DOCKERFILE for build"
 
 docker build \
-        --build-arg SERVERLESS_VERSION=1.26.1 \
-        --build-arg YARN_VERSION=1.5.1 \
+        --build-arg SERVERLESS_VERSION=1.27.2 \
+        --build-arg YARN_VERSION=1.6.0 \
         -f $DOCKERFILE \
         -t $IMAGE_NAME .