Skip to content

Commit 94ce022

Browse files
committed
wip
1 parent 3a8d55f commit 94ce022

File tree

4 files changed

+28
-42
lines changed

4 files changed

+28
-42
lines changed

Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,16 @@ run_unit_tests:
2020

2121
release_notes:
2222
./build.sh --target=ReleaseNotes
23+
24+
# clean the dirs
25+
# version the code and update the csproj files
26+
# write the release notes
27+
# build the code
28+
# unit test
29+
# acceptance test
30+
# integration test
31+
# gather the nuget packages
32+
# publish release to NuGet
33+
# publish release to GitHub
34+
2335

build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1"
1+
#tool "nuget:?package=GitVersion.CommandLine&version=5.5.1"
22
#addin nuget:?package=Cake.Json
33
#addin nuget:?package=Newtonsoft.Json
44
#addin nuget:?package=System.Net.Http&version=4.3.4

docker/Dockerfile.base

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,16 @@
11
# this is the dockerfile that create the ocelot build container
22
# build with the docker-build.sh file in this folder
3-
FROM amd64/buildpack-deps:focal-curl AS build
3+
FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build
44

5-
# update to we can install wget
5+
RUN apt install gnupg ca-certificates
6+
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
7+
RUN echo "deb https://download.mono-project.com/repo/ubuntu stable-bionic main" | tee /etc/apt/sources.list.d/mono-official-stable.list
68
RUN apt update
7-
8-
# this need to be installed like this so it doesnt block the UI
9-
RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
10-
11-
# bunch of random things .NET and mono need
12-
RUN apt install -y wget apt-transport-https git make dirmngr gnupg apt-transport-https ca-certificates software-properties-common build-essential
13-
14-
# install mono
15-
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
16-
17-
# .NET Core dependencies
18-
# RUN apt-get update \
19-
# && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
20-
# ca-certificates \
21-
# \
22-
# # .NET Core dependencies
23-
# libc6 \
24-
# libgcc1 \
25-
# libgssapi-krb5-2 \
26-
# libicu66 \
27-
# libssl1.1 \
28-
# libstdc++6 \
29-
# zlib1g
30-
31-
# Versions of .NET we need
32-
RUN wget https://packages.microsoft.com/config/ubuntu/20.10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
33-
RUN dpkg -i packages-microsoft-prod.deb
34-
RUN apt-get update && apt-get install -y \
35-
dotnet-sdk-5.0 \
36-
dotnet-sdk-3.1
37-
38-
RUN dotnet tool install --global GitVersion.Tool --version 5.5.1
39-
40-
ENV PATH="/root/.dotnet/tools:${PATH}"
41-
42-
# RUN dotnet gitversion
9+
RUN apt-get -y install mono-devel
10+
11+
RUN wget https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
12+
&& dpkg -i packages-microsoft-prod.deb \
13+
&& apt-get update; \
14+
apt-get install -y apt-transport-https && \
15+
apt-get update && \
16+
apt-get install -y dotnet-sdk-5.0

docker/docker-build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# this script build the ocelot docker file
2-
version=0.0.2
2+
version=0.0.3
33
docker build -t mijitt0m/ocelot-build -f Dockerfile.base .
44
echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
55
docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version
6-
# docker push mijitt0m/ocelot-build:latest
7-
# docker push mijitt0m/ocelot-build:$version
6+
docker push mijitt0m/ocelot-build:latest
7+
docker push mijitt0m/ocelot-build:$version

0 commit comments

Comments
 (0)