-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
445 changed files
with
5,435 additions
and
5,434 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,40 @@ | ||
| using System.IO; | ||
|
|
||
| using Microsoft.AspNetCore.Builder; | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.Extensions.Configuration; | ||
|
|
||
| using Ocelot.DependencyInjection; | ||
| using Ocelot.Middleware; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Microsoft.Extensions.Logging; | ||
| using System.IO; | ||
|
|
||
| namespace Ocelot.Samples.OcelotBasic.ApiGateway; | ||
|
|
||
| namespace OcelotBasic | ||
| public class Program | ||
| { | ||
| public class Program | ||
| public static void Main(string[] args) | ||
| { | ||
| public static void Main(string[] args) | ||
| { | ||
| new WebHostBuilder() | ||
| .UseKestrel() | ||
| .UseContentRoot(Directory.GetCurrentDirectory()) | ||
| .ConfigureAppConfiguration((hostingContext, config) => | ||
| { | ||
| config | ||
| .SetBasePath(hostingContext.HostingEnvironment.ContentRootPath) | ||
| .AddJsonFile("appsettings.json", true, true) | ||
| .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true) | ||
| .AddJsonFile("ocelot.json") | ||
| .AddEnvironmentVariables(); | ||
| }) | ||
| .ConfigureServices(s => | ||
| { | ||
| s.AddOcelot(); | ||
| }) | ||
| .ConfigureLogging((hostingContext, logging) => | ||
| { | ||
| //add your logging | ||
| }) | ||
| .UseIISIntegration() | ||
| .Configure(app => | ||
| { | ||
| app.UseOcelot().Wait(); | ||
| }) | ||
| .Build() | ||
| .Run(); | ||
| } | ||
| new WebHostBuilder() | ||
| .UseKestrel() | ||
| .UseContentRoot(Directory.GetCurrentDirectory()) | ||
| .ConfigureAppConfiguration((hostingContext, config) => | ||
| { | ||
| config | ||
| .SetBasePath(hostingContext.HostingEnvironment.ContentRootPath) | ||
| .AddJsonFile("appsettings.json", true, true) | ||
| .AddJsonFile($"appsettings.{hostingContext.HostingEnvironment.EnvironmentName}.json", true, true) | ||
| .AddJsonFile("ocelot.json") | ||
| .AddEnvironmentVariables(); | ||
| }) | ||
| .ConfigureLogging((hostingContext, logging) => | ||
| { | ||
| if (hostingContext.HostingEnvironment.IsDevelopment()) | ||
| { | ||
| logging.ClearProviders(); | ||
| logging.AddConsole(); | ||
| } | ||
| //add your logging | ||
| }) | ||
| .UseIISIntegration() | ||
| .UseStartup<Startup>() | ||
| .Build() | ||
| .Run(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| using Microsoft.AspNetCore.Builder; | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Ocelot.DependencyInjection; | ||
| using Ocelot.Middleware; | ||
|
|
||
| namespace Ocelot.Samples.OcelotBasic.ApiGateway; | ||
|
|
||
| public class Startup | ||
| { | ||
| // This method gets called by the runtime. Use this method to add services to the container. | ||
| // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 | ||
| public void ConfigureServices(IServiceCollection services) | ||
| { | ||
| services.AddOcelot(); | ||
| services.AddLogging(); | ||
| } | ||
|
|
||
| // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. | ||
| public void Configure(IApplicationBuilder app, IWebHostEnvironment env) | ||
| { | ||
| if (env.IsDevelopment()) | ||
| { | ||
| app.UseDeveloperExceptionPage(); | ||
| } | ||
|
|
||
| app.UseOcelot().Wait(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| { | ||
| "Logging": { | ||
| "LogLevel": { | ||
| "Default": "Information", | ||
| "Microsoft": "Warning", | ||
| "Microsoft.Hosting.Lifetime": "Information" | ||
| "Default": "Debug", | ||
| "Microsoft": "Information", | ||
| "Microsoft.AspNetCore": "Information", | ||
| "Microsoft.Hosting.Lifetime": "Information", | ||
| "System": "Information" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,4 +18,4 @@ | |
| "GlobalConfiguration": { | ||
| "BaseUrl": "https://localhost:5000" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,20 @@ | ||
| FROM mcr.microsoft.com/dotnet/core/aspnet:2.1-stretch-slim AS base | ||
| FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base | ||
| WORKDIR /app | ||
| EXPOSE 80 | ||
| EXPOSE 443 | ||
|
|
||
| FROM mcr.microsoft.com/dotnet/core/sdk:2.1-stretch AS build | ||
| FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build | ||
| WORKDIR /src | ||
| COPY ["ApiGateway/ApiGateway.csproj", "ApiGateway/"] | ||
| RUN dotnet restore "ApiGateway/ApiGateway.csproj" | ||
| COPY ["ApiGateway/Ocelot.Samples.OcelotKube.ApiGateway.csproj", "ApiGateway/"] | ||
| RUN dotnet restore "ApiGateway/Ocelot.Samples.OcelotKube.ApiGateway.csproj" | ||
| COPY . . | ||
| WORKDIR "/src/ApiGateway" | ||
| RUN dotnet build "ApiGateway.csproj" -c Release -o /app | ||
| RUN dotnet build "Ocelot.Samples.OcelotKube.ApiGateway.csproj" -c Release -o /app/build | ||
|
|
||
| FROM build AS publish | ||
| RUN dotnet publish "ApiGateway.csproj" -c Release -o /app | ||
| RUN dotnet publish "Ocelot.Samples.OcelotKube.ApiGateway.csproj" -c Release -o /app/publish /p:UseAppHost=false | ||
|
|
||
| FROM base AS final | ||
| WORKDIR /app | ||
| COPY --from=publish /app . | ||
| ENTRYPOINT ["dotnet", "ApiGateway.dll"] | ||
| COPY --from=publish /app/publish . | ||
| ENTRYPOINT ["dotnet", "Ocelot.Samples.OcelotKube.ApiGateway.dll"] |
33 changes: 18 additions & 15 deletions
33
...s/OcelotKube/ApiGateway/ApiGateway.csproj → ...elot.Samples.OcelotKube.ApiGateway.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> | ||
| <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" /> | ||
| <PackageReference Include="Ocelot" Version="18.0.0" /> | ||
| <PackageReference Include="Ocelot.Provider.Kubernetes" Version="18.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel> | ||
| <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\src\Ocelot.Provider.Kubernetes\Ocelot.Provider.Kubernetes.csproj" /> | ||
| <ProjectReference Include="..\..\..\src\Ocelot\Ocelot.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
Oops, something went wrong.