Skip to content

Commit

Permalink
Merge pull request deis#4735 from helgi/export_utils
Browse files Browse the repository at this point in the history
ref(contrib): expose COREOS ENV vars via export in utils.sh. Add DEIS_RELEASE
  • Loading branch information
helgi committed Nov 10, 2015
2 parents 293d657 + 349d567 commit 7e5f3ff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
5 changes: 3 additions & 2 deletions contrib/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ function echo_green {
echo -e "\033[0;32m$1\033[0m"
}

COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
COREOS_VERSION=${COREOS_VERSION:-766.5.0}
export COREOS_CHANNEL=${COREOS_CHANNEL:-stable}
export COREOS_VERSION=${COREOS_VERSION:-766.5.0}
export DEIS_RELEASE=1.13.0-dev
3 changes: 3 additions & 0 deletions docs/roadmap/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Patch Release
builder/rootfs/usr/local/src/slugbuilder/Dockerfile \
builder/rootfs/usr/local/src/slugrunner/Dockerfile \
client/deis-version \
contrib/utils.sh \
contrib/coreos/user-data.example \
controller/deis/__init__.py \
controller/Dockerfile \
Expand Down Expand Up @@ -91,6 +92,7 @@ Major or Minor Release
$ ./contrib/bumpver/bumpver -f A.B.C A.B.D \
README.md \
contrib/utils.sh \
contrib/coreos/user-data.example \
docs/_includes/_get-the-source.rst \
docs/installing_deis/install-deisctl.rst \
Expand Down Expand Up @@ -156,6 +158,7 @@ Patch Release
./contrib/bumpver/bumpver -f A.B.C A.B.D \
README.md \
contrib/utils.sh \
contrib/coreos/user-data.example \
docs/_includes/_get-the-source.rst \
docs/installing_deis/install-deisctl.rst \
Expand Down

0 comments on commit 7e5f3ff

Please sign in to comment.