Skip to content

Commit 1b87e2a

Browse files
committed
Reverted duality of config files for ocelot because were not really needed
1 parent 3b2c80e commit 1b87e2a

11 files changed

Lines changed: 4 additions & 177 deletions

File tree

.gitattributes

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,3 @@
6969
###############################################################################
7070
*.pfx binary
7171

72-
################################################################################
73-
# Ocelot config files are shared via volumes, so its EOL are important
74-
################################################################################
75-
/src/Apigw/configs/linux/mobilemarketingapigw/configuration.json text eol=lf
76-
/src/Apigw/configs/linux/mobileshoppingapigw/configuration.json text eol=lf
77-
/src/Apigw/configs/linux/webmarketingapigw/configuration.json text eol=lf
78-
/src/Apigw/configs/linux/webshoppingapigw/configuration.json text eol=lf
79-
80-
/src/Apigw/configs/windows/mobilemarketingapigw/configuration.json text eol=crlf
81-
/src/Apigw/configs/windows/mobileshoppingapigw/configuration.json text eol=crlf
82-
/src/Apigw/configs/windows/webmarketingapigw/configuration.json text eol=crlf
83-
/src/Apigw/configs/windows/webshoppingapigw/configuration.json text eol=crlf

docker-compose.override.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ services:
221221
mobileshoppingapigw:
222222
environment:
223223
- ASPNETCORE_ENVIRONMENT=Development
224-
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
224+
- IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
225225
ports:
226226
- "5200:80"
227227
volumes:
@@ -230,7 +230,7 @@ services:
230230
mobilemarketingapigw:
231231
environment:
232232
- ASPNETCORE_ENVIRONMENT=Development
233-
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
233+
- IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
234234
ports:
235235
- "5201:80"
236236
volumes:
@@ -239,17 +239,16 @@ services:
239239
webshoppingapigw:
240240
environment:
241241
- ASPNETCORE_ENVIRONMENT=Development
242-
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
242+
- IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
243243
ports:
244244
- "5202:80"
245245
volumes:
246246
- ./src/Apigw/configs/webshoppingapigw:/app/configuration
247247

248-
249248
webmarketingapigw:
250249
environment:
251250
- ASPNETCORE_ENVIRONMENT=Development
252-
- identityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
251+
- IdentityUrl=http://identity.api #Local: You need to open your local dev-machine firewall at range 5100-5110.
253252
ports:
254253
- "5203:80"
255254
volumes:

eShopOnContainers-ServicesAndWebApps.sln

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aggregators", "Aggregators"
105105
EndProject
106106
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "src\Aggregators\Mobile.Shopping.HttpAggregator\Mobile.Shopping.HttpAggregator.csproj", "{6E99F232-1536-424F-A28C-91692C8FD325}"
107107
EndProject
108-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "configs", "configs", "{D8D24753-8421-40EE-8FE5-B8BE06A07AC5}"
109-
EndProject
110-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MobileBff.Shopping.ApiGw", "MobileBff.Shopping.ApiGw", "{DAEA3807-1578-4B43-9033-E400FAF1DC49}"
111-
ProjectSection(SolutionItems) = preProject
112-
src\Apigw\configs\mobileshoppingapigw\configuration.json = src\Apigw\configs\mobileshoppingapigw\configuration.json
113-
EndProjectSection
114-
EndProject
115-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MobileBff.Marketing.ApiGw", "MobileBff.Marketing.ApiGw", "{AC3EDABD-8EB0-4045-BC12-39865490A79D}"
116-
ProjectSection(SolutionItems) = preProject
117-
src\Apigw\configs\mobilemarketingapigw\configuration.json = src\Apigw\configs\mobilemarketingapigw\configuration.json
118-
EndProjectSection
119-
EndProject
120108
Global
121109
GlobalSection(SolutionConfigurationPlatforms) = preSolution
122110
Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -1477,9 +1465,6 @@ Global
14771465
{E0C5162E-DF26-4341-9E51-14AE800D7505} = {7A58AA20-67F3-48F3-88C8-24EBFE621792}
14781466
{EA378316-9D49-4A6B-858E-D4A25F948A74} = {932D8224-11F6-4D07-B109-DA28AD288A63}
14791467
{6E99F232-1536-424F-A28C-91692C8FD325} = {EA378316-9D49-4A6B-858E-D4A25F948A74}
1480-
{D8D24753-8421-40EE-8FE5-B8BE06A07AC5} = {7A58AA20-67F3-48F3-88C8-24EBFE621792}
1481-
{DAEA3807-1578-4B43-9033-E400FAF1DC49} = {D8D24753-8421-40EE-8FE5-B8BE06A07AC5}
1482-
{AC3EDABD-8EB0-4045-BC12-39865490A79D} = {D8D24753-8421-40EE-8FE5-B8BE06A07AC5}
14831468
EndGlobalSection
14841469
GlobalSection(ExtensibilityGlobals) = postSolution
14851470
SolutionGuid = {25728519-5F0F-4973-8A64-0A81EB4EA8D9}

src/Apigw/configs/linux/mobilemarketingapigw/configuration.json renamed to src/Apigw/configs/mobilemarketingapigw/configuration.json

File renamed without changes.

src/Apigw/configs/linux/mobileshoppingapigw/configuration.json renamed to src/Apigw/configs/mobileshoppingapigw/configuration.json

File renamed without changes.

src/Apigw/configs/linux/webmarketingapigw/configuration.json renamed to src/Apigw/configs/webmarketingapigw/configuration.json

File renamed without changes.

src/Apigw/configs/linux/webshoppingapigw/configuration.json renamed to src/Apigw/configs/webshoppingapigw/configuration.json

File renamed without changes.

src/Apigw/configs/windows/mobilemarketingapigw/configuration.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Apigw/configs/windows/mobileshoppingapigw/configuration.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/Apigw/configs/windows/webmarketingapigw/configuration.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)