Merge pull request #23 from TransactionProcessing/task/#22_net7upgrade

StuartFerguson · web-flow · commit 23993a5a1e7d · 2022-11-16T16:35:32.000Z
Update shared config and docker image to net 7
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 
 WORKDIR /home/txnproc/
 COPY ["/config", "config"]
diff --git a/DockerfileWindows b/DockerfileWindows
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-windowsservercore-ltsc2019 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0-windowsservercore-ltsc2019 AS base
 
 WORKDIR /home/txnproc/
 COPY ["/config", "config"]
diff --git a/config/appsettings.json b/config/appsettings.json
@@ -12,10 +12,8 @@
     "ClientId": "", // This will be overridden in each service/application
     "ClientSecret": "", // This will be overridden in each service/application
     "EstateManagementApi": "http://192.168.0.133:5000",
-    "EstateReportingApi": "http://192.168.0.133:5005",
     "FileProcessorApi": "http://192.168.0.133:5009",
     "SecurityService": "https://192.168.0.133:5001",
-    "VoucherManagementApi": "http://192.168.0.133:5007",
     "MessagingServiceApi": "http://192.168.0.133:5006",
     "TransactionProcessorApi": "http://192.168.0.133:5002",
     "HandlerEventTypesToSilentlyHandle": {}, // This will be overridden in each service/application
diff --git a/config/appsettings.preproduction.json b/config/appsettings.preproduction.json
@@ -12,10 +12,8 @@
     "ClientId": "", // This will be overridden in each service/application
     "ClientSecret": "", // This will be overridden in each service/application
     "EstateManagementApi": "http://192.168.0.134:5000",
-    "EstateReportingApi": "http://192.168.0.134:5005",
     "FileProcessorApi": "http://192.168.0.134:5009",
     "SecurityService": "https://192.168.0.134:5001",
-    "VoucherManagementApi": "http://192.168.0.134:5007",
     "MessagingServiceApi": "http://192.168.0.134:5006",
     "TransactionProcessorApi": "http://192.168.0.134:5002",
     "HandlerEventTypesToSilentlyHandle": {}, // This will be overridden in each service/application
diff --git a/config/appsettings.staging.json b/config/appsettings.staging.json
@@ -12,10 +12,8 @@
     "ClientId": "", // This will be overridden in each service/application
     "ClientSecret": "", // This will be overridden in each service/application
     "EstateManagementApi": "http://192.168.0.133:5000",
-    "EstateReportingApi": "http://192.168.0.133:5005",
     "FileProcessorApi": "http://192.168.0.133:5009",
     "SecurityService": "https://192.168.0.133:5001",
-    "VoucherManagementApi": "http://192.168.0.133:5007",
     "MessagingServiceApi": "http://192.168.0.133:5006",
     "TransactionProcessorApi": "http://192.168.0.133:5002",
     "HandlerEventTypesToSilentlyHandle": {}, // This will be overridden in each service/application

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base`
	`1`	`+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base`
`2`	`2`
`3`	`3`	`WORKDIR /home/txnproc/`
`4`	`4`	`COPY ["/config", "config"]`