From 14da2c38856299b5fdd9051b868ebc94f0fd769c Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Tue, 9 Jan 2018 09:23:47 -0800 Subject: [PATCH 1/4] Fixed SQL pwd in docker-compose for Linux --- docker-compose.ci.build.yml | 1 + docker-compose.override.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker-compose.ci.build.yml b/docker-compose.ci.build.yml index b0c22e49f..747e8e583 100644 --- a/docker-compose.ci.build.yml +++ b/docker-compose.ci.build.yml @@ -8,6 +8,7 @@ services: - ./cli-linux:/cli-linux working_dir: /src + # Next line is using the .sln file to compile all the projects. # Sometime there is an issue in msbuild exits the process before finishing building the bits: (https://github.com/Microsoft/msbuild/issues/2153) # Random error: error MSB4017: The build stopped unexpectedly be cause of an unexpected logger failure. diff --git a/docker-compose.override.yml b/docker-compose.override.yml index f0ead3653..06cd5ee78 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -201,9 +201,9 @@ services: ports: - "5109:80" - sql.data: - environment: - - sa_password=Pass@word + sql.data: + environment: + - MSSQL_SA_PASSWORD=Pass@word - ACCEPT_EULA=Y ports: - "5433:1433" From bc619b8c4b40a23d2adbc4993510d74f81fdbf54 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Tue, 9 Jan 2018 09:35:41 -0800 Subject: [PATCH 2/4] Fixed issue with SQL container config for Linux container instead Windows Container config in docker-compose.override.yml --- docker-compose.override.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 06cd5ee78..6aa31474a 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -201,9 +201,9 @@ services: ports: - "5109:80" - sql.data: - environment: - - MSSQL_SA_PASSWORD=Pass@word + sql.data: + environment: + - MSSQL_SA_PASSWORD=Pass@word - ACCEPT_EULA=Y ports: - "5433:1433" From 1a4205491bb6328120aea589e93b48459c1ba2c1 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Tue, 9 Jan 2018 10:02:29 -0800 Subject: [PATCH 3/4] Setting SA_PASSWORD for the SQL Server Linux container config instead MSSQL__SA_PASSWORD, so it could be compatible for SQL Server on Windows Containers, too. --- docker-compose.override.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 6aa31474a..6295446cf 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -203,7 +203,7 @@ services: sql.data: environment: - - MSSQL_SA_PASSWORD=Pass@word + - SA_PASSWORD=Pass@word - ACCEPT_EULA=Y ports: - "5433:1433" From 08a5eeea71e98e5fbb55dfb645294dd245da4aa3 Mon Sep 17 00:00:00 2001 From: Cesar De la Torre Llorente Date: Tue, 9 Jan 2018 11:01:04 -0800 Subject: [PATCH 4/4] 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: