Browse Source

All docker compose to version 2.1 that seems to work in vsts hosted linux build agent

pull/457/head
Eduard Tomas 7 years ago
parent
commit
7258a58f5b
9 changed files with 12 additions and 11 deletions
  1. +4
    -3
      cli-linux/build-bits-linux.sh
  2. +1
    -1
      docker-compose-external.yml
  3. +1
    -1
      docker-compose.ci.build.yml
  4. +1
    -1
      docker-compose.nobuild.yml
  5. +1
    -1
      docker-compose.override.yml
  6. +1
    -1
      docker-compose.prod.yml
  7. +1
    -1
      docker-compose.vs.debug.yml
  8. +1
    -1
      docker-compose.vs.release.yml
  9. +1
    -1
      docker-compose.yml

+ 4
- 3
cli-linux/build-bits-linux.sh View File

@ -3,7 +3,8 @@
declare -x path=$1
if [ -z "$path" ]; then
$path="$(pwd)/../src";
$path="$(pwd)/../src";
echo -e "\e[33mNo path passed. Will use $path"
fi
declare -a projectList=(
@ -30,9 +31,9 @@ do
echo -e "\e[33m\tRemoving old publish output"
pushd $path/$project
rm -rf obj/Docker/publish
echo -e "\e[33m\tRestoring project"
echo -e "\e[33m\tRestoring project $project"
dotnet restore
echo -e "\e[33m\tBuilding and publishing projects"
echo -e "\e[33m\tBuilding and publishing $project"
dotnet publish -o obj/Docker/publish
popd
done


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

@ -1,4 +1,4 @@
version: '2'
version: '2.1'
services:
sql.data:


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

@ -1,4 +1,4 @@
version: '2'
version: '2.1'
services:
ci-build:


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

@ -1,4 +1,4 @@
version: '2'
version: '2.1'
services:
basket.api:


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

@ -1,4 +1,4 @@
version: '3'
version: '2.1'
# 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:


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

@ -1,4 +1,4 @@
version: '3'
version: '2.1'
# 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.vs.debug.yml View File

@ -1,4 +1,4 @@
version: '3'
version: '2.1'
services:
basket.api:


+ 1
- 1
docker-compose.vs.release.yml View File

@ -1,4 +1,4 @@
version: '3'
version: '2.1'
services:
basket.api:


+ 1
- 1
docker-compose.yml View File

@ -1,4 +1,4 @@
version: '3'
version: '2.1'
services:
graceperiodmanager:


Loading…
Cancel
Save