Skip to content

Commit

Permalink
Merge pull request #17 from verypossible/update-to-1.22
Browse files Browse the repository at this point in the history
bump to version 1.22.0
  • Loading branch information
brianz authored Oct 16, 2017
2 parents 90deaa4 + 8e37cbf commit 585cde8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile-python3
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
NAME = verypossible/serverless
VERSION = 1.21.0
VERSION = 1.22.0

.PHONY: all py2 py3 shell

Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

0 comments on commit 585cde8

Please sign in to comment.