Merge pull request #27 from verypossible/1.35.1

Bump Serverless to 1.35.1
verypossible · Dec 19, 2018 · 01baece · 01baece
2 parents 186f21b + d435ecb
commit 01baece
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 56 deletions.
diff --git a/Dockerfile-python2 b/Dockerfile-python2
diff --git a/Makefile b/Makefile
@@ -1,19 +1,11 @@
 NAME = verypossible/serverless
-SERVERLESS_VERSION = 1.29.0
-YARN_VERSION = 1.6.0
+SERVERLESS_VERSION = 1.35.1
+YARN_VERSION = 1.12.3
 
-.PHONY:	all py2 py3 shell
+.PHONY:	all py3 shell
 
 
-all : py2 py3
-
-py2 :
-	docker build \
-		-t $(NAME):$(SERVERLESS_VERSION)-python2 \
-		-f Dockerfile-python2 \
-		--build-arg SERVERLESS_VERSION=$(SERVERLESS_VERSION) \
-		--build-arg YARN_VERSION=$(YARN_VERSION) \
-		.
+all : py3
 
 py3 :
 	docker build \
@@ -23,8 +15,5 @@ py3 :
 		--build-arg YARN_VERSION=$(YARN_VERSION) \
 		.
 
-py2-shell :
-	docker run --rm -it $(NAME):$(SERVERLESS_VERSION)-python2 bash
-
 py3-shell :
 	docker run --rm -it $(NAME):$(SERVERLESS_VERSION) bash
diff --git a/hooks/build b/hooks/build
@@ -3,14 +3,10 @@ DOCKERFILE=Dockerfile
 
 echo "Building $CACHE_TAG using build hook!"
 
-if [[ $CACHE_TAG == *"python2"* ]]; then
-    DOCKERFILE=Dockerfile-python2
-fi
-
 echo "Using $DOCKERFILE for build"
 
 docker build \
-        --build-arg SERVERLESS_VERSION=1.29.0 \
-        --build-arg YARN_VERSION=1.6.0 \
+        --build-arg SERVERLESS_VERSION=1.35.1 \
+        --build-arg YARN_VERSION=1.12.3 \
         -f $DOCKERFILE \
         -t $IMAGE_NAME .