diff --git a/Dockerfile b/Dockerfile index f7ce6ee..c47849e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,7 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py | python RUN pip install \ awscli \ pep8 \ + pipenv \ pytest \ pytest-cov \ pytest-mock \ diff --git a/Dockerfile-python3 b/Dockerfile-python3 index 2b9bb8b..8579a62 100644 --- a/Dockerfile-python3 +++ b/Dockerfile-python3 @@ -11,6 +11,7 @@ RUN curl -s https://bootstrap.pypa.io/get-pip.py | python RUN pip install \ awscli \ pep8 \ + pipenv \ pytest \ pytest-cov \ pytest-mock \ diff --git a/Makefile b/Makefile index 9c74607..ee36c80 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = verypossible/serverless -VERSION = 1.21.0 +VERSION = 1.22.0 .PHONY: all py2 py3 shell diff --git a/README.md b/README.md index edb335f..fa50824 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,14 @@ Automated Docker build for the Serverless framework There are two `Dockerfile`s which are nearly the same. One uses Python 2 base image and the other Python 3. -These images are build from Docker Cloud. The Serverless version to build is specified as a build +These images are built in Docker Cloud. The Serverless version to build is specified as a build `ARG` (build argument) which is set using `--build-arg` during the `docker build` command. To pass this argument, we need a Docker Cloud build hook which resides in `hooks/build`. +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. + See the following for more information on Docker Cloud build hooks: https://docs.docker.com/docker-cloud/builds/advanced/#source-repository--branch-clones diff --git a/hooks/build b/hooks/build index 6f6ac62..c827ca8 100644 --- a/hooks/build +++ b/hooks/build @@ -10,6 +10,6 @@ fi echo "Using $DOCKERFILE for build" docker build \ - --build-arg SERVERLESS_VERSION=1.21.0 \ + --build-arg SERVERLESS_VERSION=1.22.0 \ -f $DOCKERFILE \ -t $IMAGE_NAME .