Skip to content

Commit

Permalink
Merge pull request #25 from verypossible/update-to-1.28
Browse files Browse the repository at this point in the history
Bump to 1.28.0
  • Loading branch information
brianz authored Jul 26, 2018
2 parents 8606a2d + ca6bb18 commit d0dc162
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
NAME = verypossible/serverless
VERSION = 1.27.2
SERVERLESS_VERSION = $(VERSION)
SERVERLESS_VERSION = 1.28.0
YARN_VERSION = 1.6.0

.PHONY: all py2 py3 shell
Expand All @@ -10,22 +9,22 @@ all : py2 py3

py2 :
docker build \
-t $(NAME):$(VERSION)-python2 \
-t $(NAME):$(SERVERLESS_VERSION)-python2 \
-f Dockerfile-python2 \
--build-arg SERVERLESS_VERSION=$(SERVERLESS_VERSION) \
--build-arg YARN_VERSION=$(YARN_VERSION) \
.

py3 :
docker build \
-t $(NAME):$(VERSION) \
-t $(NAME):$(SERVERLESS_VERSION) \
-f Dockerfile \
--build-arg SERVERLESS_VERSION=$(SERVERLESS_VERSION) \
--build-arg YARN_VERSION=$(YARN_VERSION) \
.

py2-shell :
docker run --rm -it $(NAME):$(VERSION)-python2 bash
docker run --rm -it $(NAME):$(SERVERLESS_VERSION)-python2 bash

py3-shell :
docker run --rm -it $(NAME):$(VERSION) bash
docker run --rm -it $(NAME):$(SERVERLESS_VERSION) bash
2 changes: 1 addition & 1 deletion hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi
echo "Using $DOCKERFILE for build"

docker build \
--build-arg SERVERLESS_VERSION=1.27.2 \
--build-arg SERVERLESS_VERSION=1.28.0 \
--build-arg YARN_VERSION=1.6.0 \
-f $DOCKERFILE \
-t $IMAGE_NAME .

0 comments on commit d0dc162

Please sign in to comment.