Add compose to windows

Signed-off-by: Jeffrey Morgan <[email protected]>

Author: jmorganca

Dockerfile.windows

@@ -20,6 +20,7 @@ RUN cd innosetup && \
 ENV INSTALLER_VERSION 1.9.0-rc3
 ENV DOCKER_VERSION 1.9.0-rc3
 ENV DOCKER_MACHINE_VERSION 0.5.0-rc4
+ENV DOCKER_COMPOSE_VERSION 1.5.0rc2
 ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
 ENV KITEMATIC_VERSION 0.9.2
 ENV VIRTUALBOX_VERSION 5.0.8
@@ -36,6 +37,8 @@ RUN curl -fsSL -o docker-machine.zip "https://github.com/docker/machine/releases
   unzip docker-machine.zip && \
   rm docker-machine.zip
 
+RUN curl -fsSL -o docker-compose.exe "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe"
+
 # RUN curl -fsSL -o boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
 RUN curl -fsSL -o boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
 

circle.yml

@@ -13,4 +13,4 @@ dependencies:
 test:
   override:
     - make
-    - - mkdir -p ~/docker; docker save osx-installer > ~/docker/osx-installer.tar; docker save windows-installer > ~/docker/windows-installer.tar
+    - mkdir -p ~/docker; docker save osx-installer > ~/docker/osx-installer.tar; docker save windows-installer > ~/docker/windows-installer.tar

windows/Toolbox.iss

@@ -6,6 +6,7 @@
 #define b2dIsoPath "..\bundle\boot2docker.iso"
 #define dockerCli "..\bundle\docker.exe"
 #define dockerMachineCli "..\bundle\docker-machine*.exe"
+#define dockerComposeCli "..\bundle\docker-compose.exe"
 #define kitematic "..\bundle\kitematic"
 #define git "..\bundle\Git.exe"
 #define virtualBoxCommon "..\bundle\common.cab"
@@ -56,6 +57,7 @@ Name: upgradevm; Description: "Upgrade or Migrate Boot2Docker VM to latest versi
 [Components]
 Name: "Docker"; Description: "Docker Client for Windows" ; Types: full custom; Flags: fixed
 Name: "DockerMachine"; Description: "Docker Machine for Windows" ; Types: full custom; Flags: fixed
+Name: "DockerCompose"; Description: "Docker Compose for Windows" ; Types: full custom
 Name: "VirtualBox"; Description: "VirtualBox"; Types: full custom; Flags: disablenouninstallwarning
 Name: "Kitematic"; Description: "Kitematic for Windows (Alpha)" ; Types: full custom
 Name: "Git"; Description: "Git for Windows"; Types: full custom; Flags: disablenouninstallwarning
@@ -66,6 +68,7 @@ Source: "{#dockerCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "Doc
 Source: ".\start.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
 Source: ".\delete.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "Docker"
 Source: "{#dockerMachineCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine"
+Source: "{#dockerComposeCli}"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerCompose"
 Source: ".\migrate.sh"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine"
 Source: ".\migrate.bat"; DestDir: "{app}"; Flags: ignoreversion; Components: "DockerMachine"
 Source: "{#kitematic}\*"; DestDir: "{app}\kitematic"; Flags: ignoreversion recursesubdirs; Components: "Kitematic"