From 08a5eeea71e98e5fbb55dfb645294dd245da4aa3 Mon Sep 17 00:00:00 2001
From: Cesar De la Torre Llorente <cesardl@microsoft.com>
Date: Tue, 9 Jan 2018 11:01:04 -0800
Subject: [PATCH] Downgraded version of docker-compose files to 3.3 (instead
 3.4) since VSTS agent still doesn't support it plus other versions of Docker.
 We'll upgrade to 3.4 soon, though. When VSTS supports it. Error in VSTS: 3
 error(s), 1 warning(s) Phase 1 - 3 error(s), 1 warning(s) Version in
 "/opt/vsts/work/1/s/docker-compose.yml" is unsupported. You might be seeing
 this error because you're using the wrong Compose file version. Either
 specify a supported version (e.g "2.2" or "3.3") and place your service
 definitions under the `services` key, or omit the `version` key and place
 your service definitions at the root of the file to use version 1. For more
 on the Compose file format versions, see
 https://docs.docker.com/compose/compose-file/ /usr/local/bin/docker-compose
 failed with return code: 1

---
 docker-compose-external.override.yml | 2 +-
 docker-compose-external.yml          | 2 +-
 docker-compose-windows.prod.yml      | 2 +-
 docker-compose-windows.yml           | 2 +-
 docker-compose.ci.build.yml          | 2 +-
 docker-compose.nobuild.yml           | 2 +-
 docker-compose.override.windows.yml  | 2 +-
 docker-compose.override.yml          | 2 +-
 docker-compose.prod.yml              | 2 +-
 docker-compose.yml                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker-compose-external.override.yml b/docker-compose-external.override.yml
index 4637385a1..5a4957115 100644
--- a/docker-compose-external.override.yml
+++ b/docker-compose-external.override.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 services:
   sql.data:
diff --git a/docker-compose-external.yml b/docker-compose-external.yml
index 22fe4ce89..43a1559be 100644
--- a/docker-compose-external.yml
+++ b/docker-compose-external.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 services:
   sql.data:
diff --git a/docker-compose-windows.prod.yml b/docker-compose-windows.prod.yml
index 159e27d9c..b99fed472 100644
--- a/docker-compose-windows.prod.yml
+++ b/docker-compose-windows.prod.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 # The Production docker-compose file has to have the external/real IPs or DNS names for the services 
 # The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 
diff --git a/docker-compose-windows.yml b/docker-compose-windows.yml
index 48dcfd156..de01c2ba7 100644
--- a/docker-compose-windows.yml
+++ b/docker-compose-windows.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 services:
   basket.api:
diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml
index 747e8e583..e941c6ec1 100644
--- a/docker-compose.ci.build.yml
+++ b/docker-compose.ci.build.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 services:
   ci-build:
diff --git a/docker-compose.nobuild.yml b/docker-compose.nobuild.yml
index b2ebcf903..bf1d9d24e 100644
--- a/docker-compose.nobuild.yml
+++ b/docker-compose.nobuild.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 services:
   basket.api:
diff --git a/docker-compose.override.windows.yml b/docker-compose.override.windows.yml
index 3fe15d575..448e0dc7f 100644
--- a/docker-compose.override.windows.yml
+++ b/docker-compose.override.windows.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 # ONLY NEEDED WHEN RUNNING WINDOWS CONTAINERS
 #
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 6295446cf..96e34bcf2 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 # The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. 
 # The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 443f987f8..552350251 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 # The Production docker-compose file has to have the external/real IPs or DNS names for the services 
 # The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7489c941f..d8b7318ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.3'
 
 services: