From f1db0257cedd0e3f966f44db4c169fe15cef9555 Mon Sep 17 00:00:00 2001
From: TGP <thomasgardham-pallister@Thomass-MacBook-Pro-2.local>
Date: Thu, 20 Jan 2022 19:48:12 +0000
Subject: [PATCH] install net5.0 in correct place in container

---
 .circleci/config.yml      | 4 ++--
 docker/Dockerfile.base    | 2 +-
 docker/Dockerfile.build   | 2 +-
 docker/Dockerfile.release | 2 +-
 docker/build.sh           | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6cd80b3c..f28a57ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,13 +4,13 @@ orbs:
 jobs:
   build:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.5
+      - image: mijitt0m/ocelot-build:0.0.6
     steps:
       - checkout
       - run: dotnet tool restore && dotnet cake
   release:
     docker:
-      - image: mijitt0m/ocelot-build:0.0.5
+      - image: mijitt0m/ocelot-build:0.0.6
     steps:
       - checkout
       - run: dotnet tool restore && dotnet cake --target=Release
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index 0f27d5ae..7e130fa6 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -7,4 +7,4 @@ RUN curl -L --output ./dotnet-install.sh https://dot.net/v1/dotnet-install.sh
 
 RUN chmod u+x ./dotnet-install.sh 
 
-RUN ./dotnet-install.sh -c 5.0
+RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet
diff --git a/docker/Dockerfile.build b/docker/Dockerfile.build
index 5e153ec0..c784997b 100644
--- a/docker/Dockerfile.build
+++ b/docker/Dockerfile.build
@@ -2,7 +2,7 @@
 # call from ocelot repo root with
 # docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
 # docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
-FROM mijitt0m/ocelot-build:0.0.5
+FROM mijitt0m/ocelot-build:0.0.6
 
 ARG OCELOT_COVERALLS_TOKEN
 
diff --git a/docker/Dockerfile.release b/docker/Dockerfile.release
index 7be1fd0a..69fa6f48 100644
--- a/docker/Dockerfile.release
+++ b/docker/Dockerfile.release
@@ -2,7 +2,7 @@
 # call from ocelot repo root with
 # docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
 # docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
-FROM mijitt0m/ocelot-build:0.0.5
+FROM mijitt0m/ocelot-build:0.0.6
 
 ARG OCELOT_COVERALLS_TOKEN
 ARG OCELOT_NUTGET_API_KEY
diff --git a/docker/build.sh b/docker/build.sh
index a1a5b1a6..1d0e47a1 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -1,5 +1,5 @@
 # this script build the ocelot docker file
-version=0.0.5
+version=0.0.6
 docker build --platform linux/amd64 -t mijitt0m/ocelot-build -f Dockerfile.base .
 echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
 docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version