Skip to content

Commit

Permalink
chore(release): update version to v1.12.2
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Dec 1, 2015
1 parent a19caaf commit 2c0346f
Show file tree
Hide file tree
Showing 29 changed files with 100 additions and 80 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
### v1.12.1 -> v1.12.2

#### Fixes

- [`0738c13`](https://github.com/deis/deis/commit/0738c13949187a6d444a693193585aed7e44304a) database: supports HTTPs as S3 endpoint
- [`3498099`](https://github.com/deis/deis/commit/34980992c27497735b9155ce7ff8786c048e1f41) router: fix router common prefix app publishing
- [`27eab71`](https://github.com/deis/deis/commit/27eab713f9dd1c2a4f3bc5b8152b43df7bec66b5) contrib: Add drop-in to make docker require flannel
- [`42d00af`](https://github.com/deis/deis/commit/42d00af18390745da4bebf6b3f70c11d40e09884) deisctl: don't panic when config key/value is malformed
- [`7410fb7`](https://github.com/deis/deis/commit/7410fb74c7fe5c85a9df1765d5b18ea836e68f8d) builder: Fix problem with missed git repos after builder restart

#### Documentation

- [`a19caaf`](https://github.com/deis/deis/commit/a19caaf61ad7e3f718570b93f9fe11aa0665fa2f) managing_deis: change swift3 link.
- [`82732b4`](https://github.com/deis/deis/commit/82732b486f4531242b41b44493c7f69da3aa2425) hacking: add docs to show how to use the docker-machine env

#### Maintenance

- [`0f96abe`](https://github.com/deis/deis/commit/0f96abea0a7d28257f8c87e89eb6453fec21fa79) contrib/coreos: remove debug-etcd service
- [`e1e3927`](https://github.com/deis/deis/commit/e1e39274cbed8e5fc04dfa5b6a42dc74ae1b61f7) MAINTAINERS: don't enumerate maintainers

### v1.12.0 -> v1.12.1

#### 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.12.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.12.1)
[![Current Release](http://img.shields.io/badge/release-v1.12.2-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.12.2)
[![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 @@ -62,4 +62,4 @@ RUN passwd -u git

COPY . /

ENV DEIS_RELEASE 1.13.0-dev
ENV DEIS_RELEASE 1.12.2
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.13.0-dev
ENV DEIS_RELEASE 1.12.2
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,7 +17,7 @@ USER slug
ENV HOME /app
ENTRYPOINT ["/runner/init"]

ENV DEIS_RELEASE 1.13.0-dev
ENV DEIS_RELEASE 1.12.2

ONBUILD RUN mkdir -p /app
ONBUILD WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion client/deis-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.13.0-dev
1.12.2
4 changes: 2 additions & 2 deletions contrib/coreos/user-data.example
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,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.12.1'
ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.12.2'
- name: increase-nf_conntrack-connections.service
command: start
content: |
Expand All @@ -98,7 +98,7 @@ coreos:
write_files:
- path: /etc/deis-release
content: |
DEIS_RELEASE=v1.12.1
DEIS_RELEASE=v1.12.2
- 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 contrib/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ function echo_green {

export COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
export COREOS_VERSION=${COREOS_VERSION:-766.5.0}
export DEIS_RELEASE=1.13.0-dev
export DEIS_RELEASE=1.12.2
2 changes: 1 addition & 1 deletion controller/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ ADD . /app
# Create static resources
RUN /app/manage.py collectstatic --settings=deis.settings --noinput

ENV DEIS_RELEASE 1.13.0-dev
ENV DEIS_RELEASE 1.12.2
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.13.0-dev'
__version__ = '1.12.2'
2 changes: 1 addition & 1 deletion database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ CMD ["/app/bin/boot"]
EXPOSE 5432
ADD . /app

ENV DEIS_RELEASE 1.13.0-dev
ENV DEIS_RELEASE 1.12.2
2 changes: 1 addition & 1 deletion deisctl/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,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: master]
[default: v1.12.2]
`
// 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.13.0-dev
1.12.2
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.12.1
$ git checkout v1.12.2
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.12.1
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.2
$ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.12.1
$ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.12.2
This installs ``deisctl`` version 1.12.1 to the current directory, and downloads the matching
This installs ``deisctl`` version 1.12.2 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/get-deis/deisctl-1.12.1-linux-amd64.run
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.2-linux-amd64.run

.. image:: download-osx-brightgreen.svg
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.1-darwin-amd64.run
:target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.2-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.12.1
1.12.2
If not, follow instructions to :ref:`install_deisctl`.

Expand Down
14 changes: 7 additions & 7 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.12.1
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.2
$ deisctl --version # should match the desired platform
1.12.1
$ deisctl config platform set version=v1.12.1
1.12.2
$ deisctl config platform set version=v1.12.2
$ deisctl install platform
$ deisctl start platform
Expand Down Expand Up @@ -99,11 +99,11 @@ to. Care should be taken not to overwrite the existing ``deisctl`` version.
.. code-block:: console
$ mkdir /tmp/upgrade
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1 /tmp/upgrade
$ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.2 /tmp/upgrade
$ /tmp/upgrade/deisctl --version # should match the desired platform
1.12.1
1.12.2
$ /tmp/upgrade/deisctl refresh-units
$ /tmp/upgrade/deisctl config platform set version=v1.12.1
$ /tmp/upgrade/deisctl config platform set version=v1.12.2
Now it is possible to prepare the cluster for the upgrade using the old ``deisctl`` binary. This command will shutdown
and uninstall all components of the cluster except the router and publisher. This means your services should still be
Expand All @@ -128,7 +128,7 @@ If the process were to fail, the old version can be restored manually by reinsta
$ /tmp/upgrade/deisctl stop platform
$ /tmp/upgrade/deisctl uninstall platform
$ /tmp/upgrade/deisctl config platform set version=v1.12.1
$ /tmp/upgrade/deisctl config platform set version=v1.12.2
$ /opt/bin/deisctl refresh-units
$ /opt/bin/deisctl install platform
$ /opt/bin/deisctl start platform
Expand Down
Loading

0 comments on commit 2c0346f

Please sign in to comment.