tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-19 23:32:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

install net5.0 in correct place in container

Browse Source
This commit is contained in:
TGP 2022-01-20 19:48:12 +00:00
parent c07e6ee41f
commit f1db0257ce
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -4,13 +4,13 @@ orbs:
jobs: jobs:
build: build:
docker: docker:
- image: mijitt0m/ocelot-build:0.0.5 - image: mijitt0m/ocelot-build:0.0.6
steps: steps:
- checkout - checkout
- run: dotnet tool restore && dotnet cake - run: dotnet tool restore && dotnet cake
release: release:
docker: docker:
- image: mijitt0m/ocelot-build:0.0.5 - image: mijitt0m/ocelot-build:0.0.6
steps: steps:
- checkout - checkout
- run: dotnet tool restore && dotnet cake --target=Release - run: dotnet tool restore && dotnet cake --target=Release

2
docker/Dockerfile.base
View File

@ -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 chmod u+x ./dotnet-install.sh
RUN ./dotnet-install.sh -c 5.0 RUN ./dotnet-install.sh -c 5.0 -i /usr/share/dotnet

2
docker/Dockerfile.build
View File

@ -2,7 +2,7 @@
# call from ocelot repo root with # 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/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 . # 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 ARG OCELOT_COVERALLS_TOKEN

2
docker/Dockerfile.release
View File

@ -2,7 +2,7 @@
# call from ocelot repo root with # 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/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 . # 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_COVERALLS_TOKEN
ARG OCELOT_NUTGET_API_KEY ARG OCELOT_NUTGET_API_KEY

2
docker/build.sh
View File

@ -1,5 +1,5 @@
# this script build the ocelot docker file # 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 . docker build --platform linux/amd64 -t mijitt0m/ocelot-build -f Dockerfile.base .
echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin echo $DOCKER_PASS | docker login -u $DOCKER_USER --password-stdin
docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version docker tag mijitt0m/ocelot-build mijitt0m/ocelot-build:$version