From 7254d4d1fbb93cde9ada1eecb1e9dccc761a6c5d Mon Sep 17 00:00:00 2001 From: TomPallister Date: Fri, 20 Nov 2020 10:51:49 +0000 Subject: [PATCH] +semver: breaking upgrade base build image to net5.0 --- docker/Dockerfile.base | 18 +++++++++--------- docker/docker-build.sh | 13 +++++++------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 02d91f53..42985ca8 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,9 +1,9 @@ -# this is the dockerfile that create the ocelot build container -# build with the docker-build.sh file in this folder -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build - -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 \ No newline at end of file +# this is the dockerfile that create the ocelot build container +# build with the docker-build.sh file in this folder +FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build + +RUN apt update +RUN apt install -y dirmngr gnupg apt-transport-https ca-certificates software-properties-common +RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +RUN apt-add-repository 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' +RUN apt install -y mono-devel diff --git a/docker/docker-build.sh b/docker/docker-build.sh index 8bb4e206..338a66b5 100755 --- a/docker/docker-build.sh +++ b/docker/docker-build.sh @@ -1,6 +1,7 @@ -# this script build the ocelot docker file -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:0.0.1 -docker push mijitt0m/ocelot-build:latest -docker push mijitt0m/ocelot-build:0.0.1 +# this script build the ocelot docker file +version=0.0.2 +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