Browse Source

Merge pull request #16 from dotnet-architecture/dev

upd fork
pull/1934/head
Taras Kovalenko 7 years ago
committed by GitHub
parent
commit
ba6f483061
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 11 deletions
  1. +1
    -1
      docker-compose-external.override.yml
  2. +1
    -1
      docker-compose-external.yml
  3. +1
    -1
      docker-compose-windows.prod.yml
  4. +1
    -1
      docker-compose-windows.yml
  5. +2
    -1
      docker-compose.ci.build.yml
  6. +1
    -1
      docker-compose.nobuild.yml
  7. +1
    -1
      docker-compose.override.windows.yml
  8. +2
    -2
      docker-compose.override.yml
  9. +1
    -1
      docker-compose.prod.yml
  10. +1
    -1
      docker-compose.yml

+ 1
- 1
docker-compose-external.override.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
services:
sql.data:


+ 1
- 1
docker-compose-external.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
services:
sql.data:


+ 1
- 1
docker-compose-windows.prod.yml View File

@ -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:


+ 1
- 1
docker-compose-windows.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
services:
basket.api:


+ 2
- 1
docker-compose.ci.build.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
services:
ci-build:
@ -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.


+ 1
- 1
docker-compose.nobuild.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
services:
basket.api:


+ 1
- 1
docker-compose.override.windows.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
# ONLY NEEDED WHEN RUNNING WINDOWS CONTAINERS
#


+ 2
- 2
docker-compose.override.yml View File

@ -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:
@ -203,7 +203,7 @@ services:
sql.data:
environment:
- sa_password=Pass@word
- SA_PASSWORD=Pass@word
- ACCEPT_EULA=Y
ports:
- "5433:1433"


+ 1
- 1
docker-compose.prod.yml View File

@ -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:


+ 1
- 1
docker-compose.yml View File

@ -1,4 +1,4 @@
version: '3.4'
version: '3.3'
services:


Loading…
Cancel
Save