From 4359eee68af9e7eccf35d54c773caa6c3a289551 Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Thu, 28 Jul 2016 17:16:38 -0700
Subject: [PATCH] Bump versions for 1.12.0

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
---
 Dockerfile.osx     | 8 ++++----
 Dockerfile.windows | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.osx b/Dockerfile.osx
index 734133c247..8f4e7f3d63 100644
--- a/Dockerfile.osx
+++ b/Dockerfile.osx
@@ -26,8 +26,8 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
 
 # Download the Docker parts
 
-ENV INSTALLER_VERSION 1.12.0-rc4
-ENV DOCKER_VERSION 1.12.0-rc4
+ENV INSTALLER_VERSION 1.12.0
+ENV DOCKER_VERSION 1.12.0
 
 # Why '--strip-components 3'?  The client binary is in usr/local/bin/docker in
 # the tar archive.  If we extract directly, it will create a usr/local/bin
@@ -40,12 +40,12 @@ RUN curl -fsSL -o dockerbins.tgz "https://test.docker.com/builds/Darwin/x86_64/d
 RUN chmod +x /docker
 
 
-ENV DOCKER_MACHINE_VERSION 0.8.0-rc2
+ENV DOCKER_MACHINE_VERSION 0.8.0
 RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine-Darwin-x86_64
 
 RUN chmod +x /docker-machine
 
-ENV DOCKER_COMPOSE_VERSION 1.8.0-rc2
+ENV DOCKER_COMPOSE_VERSION 1.8.0
 RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64
 RUN chmod +x /docker-compose
 
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 9b17b57917..8b18ff9fef 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -17,10 +17,10 @@ RUN cd innosetup && \
     wine "./innounp.exe" -e "is-unicode.exe"
 
 # installer components
-ENV INSTALLER_VERSION 1.12.0-rc4
-ENV DOCKER_VERSION 1.12.0-rc4
-ENV DOCKER_MACHINE_VERSION 0.8.0-rc2
-ENV DOCKER_COMPOSE_VERSION 1.8.0-rc2
+ENV INSTALLER_VERSION 1.12.0
+ENV DOCKER_VERSION 1.12.0
+ENV DOCKER_MACHINE_VERSION 0.8.0
+ENV DOCKER_COMPOSE_VERSION 1.8.0
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
 ENV KITEMATIC_VERSION 0.12.0
 ENV VIRTUALBOX_VERSION 5.0.24