Skip to content

Commit

Permalink
chore(release); update version to v1.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Jun 15, 2015
1 parent 9d579d1 commit 38f8555
Show file tree
Hide file tree
Showing 28 changed files with 78 additions and 72 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
### v1.7.2 -> v1.7.3

#### Fixes

- [`87d2ba3`](https://github.com/deis/deis/commit/87d2ba3caaafe89b911589ff149a932f31e31cf4) builder: call ls rather than using a wildcard

### v1.7.1 -> v1.7.2

#### Fixes
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage applications on your own servers. Deis builds upon [Docker](http://docker.io/) and [CoreOS](http://coreos.com) to provide a lightweight PaaS with a [Heroku-inspired](http://heroku.com) workflow.

[![Build Status](https://ci.deis.io/buildStatus/icon?job=test-acceptance)](https://ci.deis.io/job/test-acceptance/)
[![Current Release](http://img.shields.io/badge/release-v1.7.2-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.7.2)
[![Current Release](http://img.shields.io/badge/release-v1.7.3-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.7.3)
[![Latest Docs](http://img.shields.io/badge/docs-latest-fc1e5e.svg)](http://docs.deis.io/en/latest/)

![Deis Graphic](https://s3-us-west-2.amazonaws.com/deis-images/deis-graphic.png)
Expand Down
2 changes: 1 addition & 1 deletion builder/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ RUN passwd -u git

COPY . /

ENV DEIS_RELEASE 1.7.2
ENV DEIS_RELEASE 1.7.3
2 changes: 1 addition & 1 deletion builder/rootfs/usr/local/src/slugbuilder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ ADD ./builder/ /tmp/builder
RUN /tmp/builder/install-buildpacks
ENTRYPOINT ["/tmp/builder/build.sh"]

ENV DEIS_RELEASE 1.7.2
ENV DEIS_RELEASE 1.7.3
2 changes: 1 addition & 1 deletion builder/rootfs/usr/local/src/slugrunner/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ USER slug
ENV HOME /app
ENTRYPOINT ["/runner/init"]

ENV DEIS_RELEASE 1.7.2
ENV DEIS_RELEASE 1.7.3
2 changes: 1 addition & 1 deletion cache/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ WORKDIR /app
CMD ["/app/bin/boot"]
EXPOSE 6379

ENV DEIS_RELEASE 1.7.2
ENV DEIS_RELEASE 1.7.3
2 changes: 1 addition & 1 deletion client/deis.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
if hasattr(signal, 'SIGPIPE') and hasattr(signal, 'SIG_DFL'):
signal.signal(signal.SIGPIPE, signal.SIG_DFL)

__version__ = '1.7.2'
__version__ = '1.7.3'

# what version of the API is this client compatible with?
__api_version__ = '1.4'
Expand Down
2 changes: 1 addition & 1 deletion client/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@


setup(name='deis',
version='1.7.2',
version='1.7.3',
license=APACHE_LICENSE,
description='Command-line Client for Deis, the open PaaS',
author='Engine Yard',
Expand Down
4 changes: 2 additions & 2 deletions contrib/coreos/user-data.example
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ coreos:

[Service]
Type=oneshot
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.7.2'
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.7.3'
- name: debug-etcd.service
content: |
[Unit]
Expand Down Expand Up @@ -102,7 +102,7 @@ coreos:
write_files:
- path: /etc/deis-release
content: |
DEIS_RELEASE=v1.7.2
DEIS_RELEASE=v1.7.3
- path: /etc/motd
content: " \e[31m* * \e[34m* \e[32m***** \e[39mddddd eeeeeee iiiiiii ssss\n\e[31m* * \e[34m* * \e[32m* * \e[39md d e e i s s\n \e[31m* * \e[34m***** \e[32m***** \e[39md d e i s\n\e[32m***** \e[31m* * \e[34m* \e[39md d e i s\n\e[32m* * \e[31m* * \e[34m* * \e[39md d eee i sss\n\e[32m***** \e[31m* * \e[34m***** \e[39md d e i s\n \e[34m* \e[32m***** \e[31m* * \e[39md d e i s\n \e[34m* * \e[32m* * \e[31m* * \e[39md d e e i s s\n\e[34m***** \e[32m***** \e[31m* * \e[39mddddd eeeeeee iiiiiii ssss\n\n\e[39mWelcome to Deis\t\t\tPowered by Core\e[38;5;45mO\e[38;5;206mS\e[39m\n"
- path: /etc/profile.d/nse-function.sh
Expand Down
2 changes: 1 addition & 1 deletion controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ ADD . /app
# Create static resources
RUN /app/manage.py collectstatic --settings=deis.settings --noinput

ENV DEIS_RELEASE 1.7.2
ENV DEIS_RELEASE 1.7.3
2 changes: 1 addition & 1 deletion controller/deis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

from __future__ import absolute_import

__version__ = '1.7.2'
__version__ = '1.7.3'
2 changes: 1 addition & 1 deletion database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ CMD ["/app/bin/boot"]
EXPOSE 5432
ADD . /app

ENV DEIS_RELEASE 1.7.2
ENV DEIS_RELEASE 1.7.3
2 changes: 1 addition & 1 deletion deisctl/cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ Usage:
Options:
-p --path=<target> where to save unit files [default: $HOME/.deis/units]
-t --tag=<tag> git tag, branch, or SHA to use when downloading unit files
[default: v1.7.2]
[default: v1.7.3]
`
// parse command-line arguments
args, err := docopt.Parse(usage, argv, true, "", false)
Expand Down
2 changes: 1 addition & 1 deletion deisctl/deis-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.2
1.7.3
2 changes: 1 addition & 1 deletion docs/_includes/_get-the-source.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ this documentation. Download an archive file from the `releases page`_, or use
$ git clone https://github.com/deis/deis.git
$ cd deis
$ git checkout v1.7.2
$ git checkout v1.7.3
Check out the latest Deis release, rather than using the default (master).

Expand Down
10 changes: 5 additions & 5 deletions docs/installing_deis/install-deisctl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ and run the latest installer:
.. code-block:: console
$ cd ~/bin
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.7.2
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.7.3
$ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.7.2
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.7.3
This installs ``deisctl`` version 1.7.2 to the current directory, and downloads the matching
This installs ``deisctl`` version 1.7.3 to the current directory, and downloads the matching
Deis systemd unit files used to schedule the components. Link ``deisctl`` into /usr/local/bin, so
it will be in your ``$PATH``:

Expand All @@ -33,10 +33,10 @@ it will be in your ``$PATH``:
To change installation options, save the installer directly:

.. image:: download-linux-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.7.2-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.7.3-linux-amd64.run

.. image:: download-osx-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.7.2-darwin-amd64.run
:target: https://s3-us-west-2.amazonaws.com/opdemand/deisctl-1.7.3-darwin-amd64.run

Then run the downloaded file as a shell script. Append ``--help`` to see what options
are available.
Expand Down
2 changes: 1 addition & 1 deletion docs/installing_deis/install-platform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ First check that you have ``deisctl`` installed and the version is correct.
.. code-block:: console
$ deisctl --version
1.7.2
1.7.3
If not, follow instructions to :ref:`install_deisctl`.

Expand Down
6 changes: 3 additions & 3 deletions docs/managing_deis/upgrading-deis.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ Finally, update ``deisctl`` to the new version and reinstall:

.. code-block:: console
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.7.2
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.7.3
$ deisctl --version # should match the desired platform
1.7.2
$ deisctl config platform set version=v1.7.2
1.7.3
$ deisctl config platform set version=v1.7.3
$ deisctl install platform
$ deisctl start platform
Expand Down
Loading

0 comments on commit 38f8555

Please sign in to comment.