diff options
| author | crupest <crupest@outlook.com> | 2020-05-31 15:35:25 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2020-05-31 15:35:25 +0800 |
| commit | 15c533eb324526776f4a8a9d82b150dbfd46d7e6 (patch) | |
| tree | a80b0b565d55e60db1468a45218d5b8f4012c871 /Timeline | |
| parent | ce13fcc16987cb9c25b07f94388093b6e9fd2290 (diff) | |
| download | timeline-15c533eb324526776f4a8a9d82b150dbfd46d7e6.tar.gz timeline-15c533eb324526776f4a8a9d82b150dbfd46d7e6.tar.bz2 timeline-15c533eb324526776f4a8a9d82b150dbfd46d7e6.zip | |
Migrate to docker.
Diffstat (limited to 'Timeline')
| -rw-r--r-- | Timeline/Dockerfile | 4 | ||||
| -rw-r--r-- | Timeline/Services/PathProvider.cs | 2 | ||||
| -rw-r--r-- | Timeline/Startup.cs | 6 | ||||
| -rw-r--r-- | Timeline/appsettings.json | 5 |
4 files changed, 7 insertions, 10 deletions
diff --git a/Timeline/Dockerfile b/Timeline/Dockerfile new file mode 100644 index 00000000..68685a55 --- /dev/null +++ b/Timeline/Dockerfile @@ -0,0 +1,4 @@ +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 +WORKDIR /app +COPY ./publish . +ENTRYPOINT ["dotnet", "Timeline.dll"] diff --git a/Timeline/Services/PathProvider.cs b/Timeline/Services/PathProvider.cs index 1f6b629a..eefbf41a 100644 --- a/Timeline/Services/PathProvider.cs +++ b/Timeline/Services/PathProvider.cs @@ -21,7 +21,7 @@ namespace Timeline.Services public PathProvider(IConfiguration configuration)
{
_configuration = configuration;
- _workingDirectory = configuration.GetValue<string>("WorkDir");
+ _workingDirectory = configuration.GetValue<string?>("WorkDir") ?? "/timeline";
}
public string GetWorkingDirectory()
diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs index b6c3ff7f..09281551 100644 --- a/Timeline/Startup.cs +++ b/Timeline/Startup.cs @@ -36,12 +36,6 @@ namespace Timeline // This method gets called by the runtime. Use this method to add services to the container.
public void ConfigureServices(IServiceCollection services)
{
- var workDir = Configuration.GetValue<string?>("WorkDir");
- if (workDir == null)
- {
- throw new InvalidOperationException("Please set a work directory first.");
- }
-
services.AddControllers(setup =>
{
setup.InputFormatters.Add(new StringInputFormatter());
diff --git a/Timeline/appsettings.json b/Timeline/appsettings.json index 09840cd6..804ca43a 100644 --- a/Timeline/appsettings.json +++ b/Timeline/appsettings.json @@ -6,7 +6,6 @@ },
"Jwt": {
"Issuer": "api.crupest.xyz",
- "Audience": "api.crupest.xyz",
- },
- "Cors": [ "https://www.crupest.xyz", "https://crupest.xyz" ]
+ "Audience": "api.crupest.xyz"
+ }
}
|