From 94ce0224d7176ba4de6ff65c7ad397fdf664b251 Mon Sep 17 00:00:00 2001
From: TomPallister <tom@threemammals.com>
Date: Thu, 26 Nov 2020 11:03:38 +0000
Subject: [PATCH] wip

---
 Makefile               | 12 +++++++++++
 build.cake             |  2 +-
 docker/Dockerfile.base | 48 ++++++++++--------------------------------
 docker/docker-build.sh |  6 +++---
 4 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/Makefile b/Makefile
index 7f62b978..04a3eaca 100644
--- a/Makefile
+++ b/Makefile
@@ -20,4 +20,16 @@ run_unit_tests:
 
 release_notes:
 	./build.sh --target=ReleaseNotes
+	
+# clean the dirs
+# version the code and update the csproj files
+# write the release notes
+# build the code
+# unit test
+# acceptance test
+# integration test
+# gather the nuget packages 
+# publish release to NuGet
+# publish release to GitHub
+
 	
\ No newline at end of file
diff --git a/build.cake b/build.cake
index efd9e76b..592e9858 100644
--- a/build.cake
+++ b/build.cake
@@ -1,4 +1,4 @@
-#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
+#tool "nuget:?package=GitVersion.CommandLine&version=5.5.1"
 #addin nuget:?package=Cake.Json
 #addin nuget:?package=Newtonsoft.Json
 #addin nuget:?package=System.Net.Http&version=4.3.4
diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index 692b281e..cc6798c3 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -1,42 +1,16 @@
 # this is the dockerfile that create the ocelot build container
 # build with the docker-build.sh file in this folder
-FROM amd64/buildpack-deps:focal-curl AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build
 
-# update to we can install wget
+RUN apt install gnupg ca-certificates
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+RUN echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | tee /etc/apt/sources.list.d/mono-official-stable.list
 RUN apt update
+RUN apt-get -y install mono-devel
 
-# this need to be installed like this so it doesnt block the UI
-RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
-
-# bunch of random things .NET and mono need
-RUN apt install -y wget apt-transport-https git make dirmngr gnupg apt-transport-https ca-certificates software-properties-common build-essential
-
-# install mono
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && apt-add-repository 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' && apt install -y mono-complete
-
-# .NET Core dependencies
-# RUN apt-get update \
-#     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-#         ca-certificates \
-#         \
-#         # .NET Core dependencies
-#         libc6 \
-#         libgcc1 \
-#         libgssapi-krb5-2 \
-#         libicu66 \
-#         libssl1.1 \
-#         libstdc++6 \
-#         zlib1g
-
-# Versions of .NET we need
-RUN wget https://packages.microsoft.com/config/ubuntu/20.10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
-RUN dpkg -i packages-microsoft-prod.deb
-RUN apt-get update && apt-get install -y  \
-    dotnet-sdk-5.0 \
-    dotnet-sdk-3.1
-
-RUN dotnet tool install --global GitVersion.Tool --version 5.5.1    
-
-ENV PATH="/root/.dotnet/tools:${PATH}"
-
-# RUN dotnet gitversion
\ No newline at end of file
+RUN wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+    && dpkg -i packages-microsoft-prod.deb \
+    && apt-get update; \
+    apt-get install -y apt-transport-https && \
+    apt-get update && \
+    apt-get install -y dotnet-sdk-5.0
\ No newline at end of file
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
index 05a1c0ce..d2d63934 100755
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -1,7 +1,7 @@
 # this script build the ocelot docker file
-version=0.0.2
+version=0.0.3
 docker build -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
-# docker push mijitt0m/ocelot-build:latest
-# docker push mijitt0m/ocelot-build:$version
+docker push mijitt0m/ocelot-build:latest
+docker push mijitt0m/ocelot-build:$version