Skip to content

Commit 92e8aaf

Browse files
David BritchDavid Britch
authored andcommitted
Merge branch 'master' into xamarin
2 parents dfe4588 + c0f919a commit 92e8aaf

6 files changed

Lines changed: 1 addition & 3 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You can download them and start reviewing these Guides/eBooks here:
4242
| Architecting & Developing | Containers Lifecycle & CI/CD | App patterns with Xamarin.Forms |
4343
| ------------ | ------------| ------------|
4444
| <a href='https://aka.ms/microservicesebook'><img src="img/ebook_arch_dev_microservices_containers_cover.png"> </a> | <a href='https://aka.ms/dockerlifecycleebook'> <img src="img/ebook_containers_lifecycle.png"> </a> | <a href='https://aka.ms/xamarinpatternsebook'> <img src="img/xamarin-enterprise-patterns-ebook-cover-small.png"> </a> |
45-
| <sup> <a href='https://aka.ms/microservicesebook'>**Download** (Early DRAFT, still work in progress)</a> </sup> | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download** (First Edition from late 2016) </a> </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download** (Early DRAFT, still work in progress) </a> </sup> |
45+
| <sup> <a href='https://aka.ms/microservicesebook'>**Download** (Early DRAFT, still work in progress)</a> </sup> | <sup> <a href='https://aka.ms/dockerlifecycleebook'>**Download** (First Edition from late 2016) </a> </sup> | <sup> <a href='https://aka.ms/xamarinpatternsebook'>**Download** (Preview Edition) </a> </sup> |
4646

4747
Send feedback to [dotnet-architecture-ebooks-feedback@service.microsoft.com](dotnet-architecture-ebooks-feedback@service.microsoft.com)
4848
<p>

docker-compose.override.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ services:
4545
- ASPNETCORE_URLS=http://0.0.0.0:5102
4646
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
4747
- identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
48-
- BasketUrl=http://basket.api:5103
4948
- EventBusConnection=rabbitmq
5049
ports:
5150
- "5102:5102"

docker-compose.prod.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ services:
5050
- ASPNETCORE_URLS=http://0.0.0.0:5102
5151
- ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
5252
- identityUrl=http://identity.api:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105.
53-
- BasketUrl=http://basket.api:5103
5453
- EventBusConnection=rabbitmq
5554
ports:
5655
- "5102:5102"
947 KB
Binary file not shown.
-2.81 KB
Loading

0 commit comments

Comments
 (0)