From ceea6a5286f8da9708286906d90dfecd9d1ce036 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Tue, 28 Mar 2017 18:30:13 -0700 Subject: [PATCH] Update .NET packages to 1.1.1, fix nginx redirect issue --- Podsync.sln | 1 + src/Podsync/Dockerfile | 2 +- src/Podsync/Podsync.csproj | 75 +++++++++++++++++++------ src/nginx/nginx.conf | 8 ++- test/Podsync.Tests/Podsync.Tests.csproj | 28 ++++++--- 5 files changed, 85 insertions(+), 29 deletions(-) diff --git a/Podsync.sln b/Podsync.sln index 1d8f645..77ffdb0 100644 --- a/Podsync.sln +++ b/Podsync.sln @@ -8,6 +8,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{15355284-4B88-4EF3-B580-20907F343E43}" ProjectSection(SolutionItems) = preProject .gitignore = .gitignore + docker-compose.yml = docker-compose.yml EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Podsync", "src\Podsync\Podsync.csproj", "{C9283472-E95E-4517-AE3B-3E276B9851E4}" diff --git a/src/Podsync/Dockerfile b/src/Podsync/Dockerfile index 4c7520a..1b0adf7 100644 --- a/src/Podsync/Dockerfile +++ b/src/Podsync/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/aspnetcore:1.1.0 +FROM microsoft/aspnetcore:1.1.1 ARG PUBLISH_DIR="bin/Publish" diff --git a/src/Podsync/Podsync.csproj b/src/Podsync/Podsync.csproj index 7eedcb7..ebceb10 100644 --- a/src/Podsync/Podsync.csproj +++ b/src/Podsync/Podsync.csproj @@ -14,27 +14,66 @@ - + + 1.23.0.760 + - - - - - - - - - - - - - - - - + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.2 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + - + + 1.2.1 + diff --git a/src/nginx/nginx.conf b/src/nginx/nginx.conf index 759a564..ff0ff6c 100644 --- a/src/nginx/nginx.conf +++ b/src/nginx/nginx.conf @@ -7,9 +7,11 @@ server { location / { proxy_pass http://app:5001; proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection ""; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_cache_bypass $http_upgrade; } } \ No newline at end of file diff --git a/test/Podsync.Tests/Podsync.Tests.csproj b/test/Podsync.Tests/Podsync.Tests.csproj index 99047b6..23173a4 100644 --- a/test/Podsync.Tests/Podsync.Tests.csproj +++ b/test/Podsync.Tests/Podsync.Tests.csproj @@ -10,14 +10,28 @@ false - - - - - - + + 1.1.1 + + + 1.1.1 + + + 1.1.1 + + + 15.0.0 + + + 4.7.8 + + + 2.2.0 + - + + 2.2.0 +