From cca98432310f320213c8738bb30f4c5f3dee2496 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Tue, 3 Mar 2015 09:06:55 -0700 Subject: [PATCH] chore(release): update version in master to v1.5.0-dev --- builder/image/Dockerfile | 2 +- builder/image/slugbuilder/Dockerfile | 2 +- builder/image/slugrunner/Dockerfile | 2 +- cache/image/Dockerfile | 2 +- client/deis.py | 2 +- client/setup.py | 2 +- controller/Dockerfile | 3 +-- controller/deis/__init__.py | 2 +- database/Dockerfile | 2 +- deisctl/cmd/cmd.go | 2 +- deisctl/deis-version | 2 +- logger/image/Dockerfile | 2 +- logspout/image/Dockerfile | 2 +- publisher/image/Dockerfile | 2 +- registry/Dockerfile | 2 +- router/image/Dockerfile | 2 +- store/base/Dockerfile | 2 +- version/version.go | 2 +- 18 files changed, 18 insertions(+), 19 deletions(-) diff --git a/builder/image/Dockerfile b/builder/image/Dockerfile index 4179a951e8..63490d0012 100644 --- a/builder/image/Dockerfile +++ b/builder/image/Dockerfile @@ -63,4 +63,4 @@ ADD etc /etc ADD . /app RUN chown -R root:root /app -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/builder/image/slugbuilder/Dockerfile b/builder/image/slugbuilder/Dockerfile index 9af7e08f7c..4a740af1ae 100644 --- a/builder/image/slugbuilder/Dockerfile +++ b/builder/image/slugbuilder/Dockerfile @@ -12,5 +12,5 @@ ADD ./builder/ /tmp/builder RUN /tmp/builder/install-buildpacks ENTRYPOINT ["/tmp/builder/build.sh"] -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/builder/image/slugrunner/Dockerfile b/builder/image/slugrunner/Dockerfile index ef9b948e64..33a807cf1b 100644 --- a/builder/image/slugrunner/Dockerfile +++ b/builder/image/slugrunner/Dockerfile @@ -18,5 +18,5 @@ USER slug ENV HOME /app ENTRYPOINT ["/runner/init"] -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/cache/image/Dockerfile b/cache/image/Dockerfile index ffa0f86f1b..8c0cdbfd6a 100644 --- a/cache/image/Dockerfile +++ b/cache/image/Dockerfile @@ -6,4 +6,4 @@ WORKDIR /app CMD ["/app/bin/boot"] EXPOSE 6379 -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/client/deis.py b/client/deis.py index a4cb0e11ca..0dd1001a76 100755 --- a/client/deis.py +++ b/client/deis.py @@ -68,7 +68,7 @@ import requests from termcolor import colored -__version__ = '1.4.0' +__version__ = '1.5.0-dev' # what version of the API is this client compatible with? __api_version__ = '1.1' diff --git a/client/setup.py b/client/setup.py index c240caa16a..7cafb37f33 100755 --- a/client/setup.py +++ b/client/setup.py @@ -28,7 +28,7 @@ setup(name='deis', - version='1.4.0', + version='1.5.0-dev', license=APACHE_LICENSE, description='Command-line Client for Deis, the open PaaS', author='OpDemand', diff --git a/controller/Dockerfile b/controller/Dockerfile index a961d8ca50..a493114a6f 100644 --- a/controller/Dockerfile +++ b/controller/Dockerfile @@ -31,5 +31,4 @@ ADD . /app # Create static resources RUN /app/manage.py collectstatic --settings=deis.settings --noinput -ENV DEIS_RELEASE 1.4.0 - +ENV DEIS_RELEASE 1.5.0-dev diff --git a/controller/deis/__init__.py b/controller/deis/__init__.py index 765b165d67..6b4d3fe008 100644 --- a/controller/deis/__init__.py +++ b/controller/deis/__init__.py @@ -6,4 +6,4 @@ from __future__ import absolute_import -__version__ = '1.4.0' +__version__ = '1.5.0-dev' diff --git a/database/Dockerfile b/database/Dockerfile index f5e749ff18..1073c9ff4f 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -22,5 +22,5 @@ CMD ["/app/bin/boot"] EXPOSE 5432 ADD . /app -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/deisctl/cmd/cmd.go b/deisctl/cmd/cmd.go index a27f7598f5..c897e5dfa9 100644 --- a/deisctl/cmd/cmd.go +++ b/deisctl/cmd/cmd.go @@ -626,7 +626,7 @@ Usage: Options: -p --path= where to save unit files [default: $HOME/.deis/units] -t --tag= git tag, branch, or SHA to use when downloading unit files - [default: v1.4.0] + [default: master] ` // parse command-line arguments args, err := docopt.Parse(usage, argv, true, "", false) diff --git a/deisctl/deis-version b/deisctl/deis-version index 88c5fb891d..59b9db0c75 100644 --- a/deisctl/deis-version +++ b/deisctl/deis-version @@ -1 +1 @@ -1.4.0 +1.5.0-dev diff --git a/logger/image/Dockerfile b/logger/image/Dockerfile index aca5c8077e..b190f21970 100644 --- a/logger/image/Dockerfile +++ b/logger/image/Dockerfile @@ -5,5 +5,5 @@ EXPOSE 514 ADD . / -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/logspout/image/Dockerfile b/logspout/image/Dockerfile index 7e2efbd340..b5e4618344 100644 --- a/logspout/image/Dockerfile +++ b/logspout/image/Dockerfile @@ -7,5 +7,5 @@ CMD ["/bin/logspout"] ADD logspout /bin/logspout -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/publisher/image/Dockerfile b/publisher/image/Dockerfile index f5ead2c672..effd38e901 100644 --- a/publisher/image/Dockerfile +++ b/publisher/image/Dockerfile @@ -3,5 +3,5 @@ FROM ubuntu-debootstrap:14.04 ADD bin/publisher /usr/local/bin/publisher ENTRYPOINT ["/usr/local/bin/publisher"] -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/registry/Dockerfile b/registry/Dockerfile index 4fa191ef27..8525b099b8 100644 --- a/registry/Dockerfile +++ b/registry/Dockerfile @@ -27,5 +27,5 @@ RUN DOCKER_BUILD=true /app/build.sh ADD . /app -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/router/image/Dockerfile b/router/image/Dockerfile index d3e3d8bd81..c5c68e6536 100644 --- a/router/image/Dockerfile +++ b/router/image/Dockerfile @@ -24,5 +24,5 @@ ADD nginx.tgz /opt/nginx RUN rm nginx.tgz -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/store/base/Dockerfile b/store/base/Dockerfile index 05d5dd1a22..6b489ffcb4 100644 --- a/store/base/Dockerfile +++ b/store/base/Dockerfile @@ -9,5 +9,5 @@ RUN DOCKER_BUILD=true /tmp/build.sh # Add shared confd configuration ADD . /app -ENV DEIS_RELEASE 1.4.0 +ENV DEIS_RELEASE 1.5.0-dev diff --git a/version/version.go b/version/version.go index 3c697258a7..c10a4e3e99 100644 --- a/version/version.go +++ b/version/version.go @@ -1,4 +1,4 @@ package version // Version identifies this Deis product revision. -const Version = "1.4.0" +const Version = "1.5.0-dev"