From 3bcf2ccdf8594fa79375aee0596069e1e6ae9f94 Mon Sep 17 00:00:00 2001 From: Chika Date: Sun, 15 Nov 2020 15:40:51 +0300 Subject: [PATCH] add docker files --- .dockerignore | 2 ++ Dockerfile | 12 ++++++++ .../Controllers/v1/CalculationController.cs | 6 ++++ EvoCalculator.Core/Program.cs | 3 +- docker-compose.yml | 30 +++++++++++++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..cbbd0b5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +bin/ +obj/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9587269 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +# Stage 1 +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build +WORKDIR /build +COPY . . +RUN dotnet restore +RUN dotnet publish -c Release -o /app +# Stage 2 +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS final +WORKDIR /app +COPY --from=build /app . +EXPOSE 80 +ENTRYPOINT ["dotnet", "EvoCalculator.Core.dll"] \ No newline at end of file diff --git a/EvoCalculator.Core/Controllers/v1/CalculationController.cs b/EvoCalculator.Core/Controllers/v1/CalculationController.cs index bec2cbd..8fdeeb9 100644 --- a/EvoCalculator.Core/Controllers/v1/CalculationController.cs +++ b/EvoCalculator.Core/Controllers/v1/CalculationController.cs @@ -11,6 +11,12 @@ namespace EvoCalculator.Core.Controllers.V1 [Route("api/v{version:apiVersion}/[controller]")] public class CalculationController : Controller { + [HttpGet("[action]")] + public ActionResult Test() + { + return "ok"; + } + [HttpPost("[action]")] public ActionResult Calculate([FromBody] RequestCalculation requestCalculation) { diff --git a/EvoCalculator.Core/Program.cs b/EvoCalculator.Core/Program.cs index 7ac157e..8516d78 100644 --- a/EvoCalculator.Core/Program.cs +++ b/EvoCalculator.Core/Program.cs @@ -18,6 +18,7 @@ namespace EvoCalculator.Core public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }); + .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }).ConfigureWebHostDefaults( + webBuilder => { webBuilder.UseStartup(); }); } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8d01dab --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,30 @@ +version: '3.1' + +networks: + web: + external: true + +services: + calculatorcore: + image: evocalculator.core + container_name: calculator-core + restart: unless-stopped + +# depends_on: +# - joomladb + +# ports: +# - 8080:80 + + labels: + - "traefik.enable=true" + - "traefik.backend=calculator-core" + - "traefik.docker.network=web" + - "traefik.http.routers.calculator-core.rule=Host(`calculator-core.evoleasing.ru`)" + - "traefik.http.routers.calculator-core.entrypoints=web-secure" + - "traefik.http.routers.calculator-core.tls.certresolver=le" + +# volumes: +# - /snap/docker/docker_volumes/joomla/html:/var/www/html + networks: + - web