chore(release): update version to v1.12.1

teamhephy · Nov 10, 2015 · f4f1b12 · f4f1b12
1 parent 661aaa3
commit f4f1b12
Show file tree

Hide file tree

Showing 28 changed files with 92 additions and 79 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+### v1.12.0 -> v1.12.1
+
+#### Fixes
+
+ - [`293d657`](https://github.com/deis/deis/commit/293d6572d2d0da73595bd7e178e438e83115c2e6) registry: fix create_bucket s3 compatability
+ - [`b07db69`](https://github.com/deis/deis/commit/b07db69e9b3ad197d869fec4cb0b5a7051a0ef16) user-data: always start flannel on boot
+ - [`d9ef023`](https://github.com/deis/deis/commit/d9ef0234f4cbab8f806f7970d71d883da1261e52) contrib: re-introduce data dir mapping for etcd
+ - [`070d081`](https://github.com/deis/deis/commit/070d081838e262256b7987fd2e9e6c44aff48dd1) create_bucket: check for existence of None
+
+#### Maintenance
+
+ - [`3eb277a`](https://github.com/deis/deis/commit/3eb277a4f90c2bd2733764e49b9ce70e7c3567e9) (all): bump CoreOS to 766.5.0
+
 ### v1.11.2 -> v1.12.0
 
 #### Features

diff --git a/README.md b/README.md
@@ -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.0-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.12.0)
+[![Current Release](http://img.shields.io/badge/release-v1.12.1-1eb0fc.svg)](https://github.com/deis/deis/releases/tag/v1.12.1)
 [![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)

diff --git a/builder/rootfs/Dockerfile b/builder/rootfs/Dockerfile
@@ -62,4 +62,4 @@ RUN passwd -u git
 
 COPY . /
 
-ENV DEIS_RELEASE 1.12.0
+ENV DEIS_RELEASE 1.12.1
diff --git a/builder/rootfs/usr/local/src/slugbuilder/Dockerfile b/builder/rootfs/usr/local/src/slugbuilder/Dockerfile
@@ -11,4 +11,4 @@ ADD ./builder/ /tmp/builder
 RUN /tmp/builder/install-buildpacks
 ENTRYPOINT ["/tmp/builder/build.sh"]
 
-ENV DEIS_RELEASE 1.12.0
+ENV DEIS_RELEASE 1.12.1
diff --git a/builder/rootfs/usr/local/src/slugrunner/Dockerfile b/builder/rootfs/usr/local/src/slugrunner/Dockerfile
@@ -17,7 +17,7 @@ USER slug
 ENV HOME /app
 ENTRYPOINT ["/runner/init"]
 
-ENV DEIS_RELEASE 1.12.0
+ENV DEIS_RELEASE 1.12.1
 
 ONBUILD RUN mkdir -p /app
 ONBUILD WORKDIR /app

diff --git a/client/deis-version b/client/deis-version
@@ -1 +1 @@
-1.12.0
+1.12.1
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -79,7 +79,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.0'
+        ExecStart=/usr/bin/sh -c 'curl -sSL --retry 5 --retry-delay 2 http://deis.io/deisctl/install.sh | sh -s 1.12.1'
     - name: debug-etcd.service
       content: |
         [Unit]
@@ -100,7 +100,7 @@ coreos:
 write_files:
   - path: /etc/deis-release
     content: |
-      DEIS_RELEASE=v1.12.0
+      DEIS_RELEASE=v1.12.1
   - 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

diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -29,4 +29,4 @@ ADD . /app
 # Create static resources
 RUN /app/manage.py collectstatic --settings=deis.settings --noinput
 
-ENV DEIS_RELEASE 1.12.0
+ENV DEIS_RELEASE 1.12.1
diff --git a/controller/deis/__init__.py b/controller/deis/__init__.py
@@ -6,4 +6,4 @@
 
 from __future__ import absolute_import
 
-__version__ = '1.12.0'
+__version__ = '1.12.1'
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -20,4 +20,4 @@ CMD ["/app/bin/boot"]
 EXPOSE 5432
 ADD . /app
 
-ENV DEIS_RELEASE 1.12.0
+ENV DEIS_RELEASE 1.12.1
diff --git a/deisctl/client/client.go b/deisctl/client/client.go
@@ -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: v1.12.0]
+                       [default: v1.12.1]
 `
 	// parse command-line arguments
 	args, err := docopt.Parse(usage, argv, true, "", false)

diff --git a/deisctl/deis-version b/deisctl/deis-version
@@ -1 +1 @@
-1.12.0
+1.12.1
diff --git a/docs/_includes/_get-the-source.rst b/docs/_includes/_get-the-source.rst
@@ -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.0
+    $ git checkout v1.12.1
 
 Check out the latest Deis release, rather than using the default (master).
 

diff --git a/docs/installing_deis/install-deisctl.rst b/docs/installing_deis/install-deisctl.rst
@@ -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.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1
     $ # on CoreOS, add "sudo" to install to /opt/bin/deisctl
-    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.12.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sudo sh -s 1.12.1
 
-This installs ``deisctl`` version 1.12.0 to the current directory, and downloads the matching
+This installs ``deisctl`` version 1.12.1 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``:
 
@@ -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.0-linux-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.1-linux-amd64.run
 
 .. image:: download-osx-brightgreen.svg
-   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.0-darwin-amd64.run
+   :target: https://s3-us-west-2.amazonaws.com/get-deis/deisctl-1.12.1-darwin-amd64.run
 
 Then run the downloaded file as a shell script. Append ``--help`` to see what options
 are available.

diff --git a/docs/installing_deis/install-platform.rst b/docs/installing_deis/install-platform.rst
@@ -14,7 +14,7 @@ First check that you have ``deisctl`` installed and the version is correct.
 .. code-block:: console
 
     $ deisctl --version
-    1.12.0
+    1.12.1
 
 If not, follow instructions to :ref:`install_deisctl`.
 

diff --git a/docs/managing_deis/upgrading-deis.rst b/docs/managing_deis/upgrading-deis.rst
@@ -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.0
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1
     $ deisctl --version  # should match the desired platform
-    1.12.0
-    $ deisctl config platform set version=v1.12.0
+    1.12.1
+    $ deisctl config platform set version=v1.12.1
     $ deisctl install platform
     $ deisctl start platform
 
@@ -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.0 /tmp/upgrade
+    $ curl -sSL http://deis.io/deisctl/install.sh | sh -s 1.12.1 /tmp/upgrade
     $ /tmp/upgrade/deisctl --version  # should match the desired platform
-    1.12.0
+    1.12.1
     $ /tmp/upgrade/deisctl refresh-units
-    $ /tmp/upgrade/deisctl config platform set version=v1.12.0
+    $ /tmp/upgrade/deisctl config platform set version=v1.12.1
 
 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
@@ -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.0
+    $ /tmp/upgrade/deisctl config platform set version=v1.12.1
     $ /opt/bin/deisctl refresh-units
     $ /opt/bin/deisctl install platform
     $ /opt/bin/deisctl start platform
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.12.0
		ENV DEIS_RELEASE 1.12.1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@

		from __future__ import absolute_import

		__version__ = '1.12.0'
		__version__ = '1.12.1'
-Original file line number
+Diff line change
@@ Expand Up @@
     .. code-block:: console
         $ deisctl --version
-.12.0
+.12.1
     If not, follow instructions to :ref:`install_deisctl`.
@@ Expand Down @@