Skip to content

Commit f1db025

Browse files
TGPTGP
authored andcommitted
install net5.0 in correct place in container
1 parent c07e6ee commit f1db025

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ orbs:
44
jobs:
55
build:
66
docker:
7-
- image: mijitt0m/ocelot-build:0.0.5
7+
- image: mijitt0m/ocelot-build:0.0.6
88
steps:
99
- checkout
1010
- run: dotnet tool restore && dotnet cake
1111
release:
1212
docker:
13-
- image: mijitt0m/ocelot-build:0.0.5
13+
- image: mijitt0m/ocelot-build:0.0.6
1414
steps:
1515
- checkout
1616
- run: dotnet tool restore && dotnet cake --target=Release

docker/Dockerfile.base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ RUN curl -L --output ./dotnet-install.sh https://dot.net/v1/dotnet-install.sh
77

88
RUN chmod u+x ./dotnet-install.sh
99

10-
RUN ./dotnet-install.sh -c 5.0
10+
RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet

docker/Dockerfile.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# call from ocelot repo root with
33
# docker build --platform linux/arm64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
44
# docker build --platform linux/amd64 --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
5-
FROM mijitt0m/ocelot-build:0.0.5
5+
FROM mijitt0m/ocelot-build:0.0.6
66

77
ARG OCELOT_COVERALLS_TOKEN
88

docker/Dockerfile.release

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# call from ocelot repo root with
33
# 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 .
44
# 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 .
5-
FROM mijitt0m/ocelot-build:0.0.5
5+
FROM mijitt0m/ocelot-build:0.0.6
66

77
ARG OCELOT_COVERALLS_TOKEN
88
ARG OCELOT_NUTGET_API_KEY

docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# this script build the ocelot docker file
2-
version=0.0.5
2+
version=0.0.6
33
docker build --platform linux/amd64 -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

0 commit comments

Comments
 (0)