Skip to content

Commit 7a6d633

Browse files
committed
chore: merge
2 parents d79e675 + 80785ee commit 7a6d633

File tree

5 files changed

+40
-8
lines changed

5 files changed

+40
-8
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# [1.1.0](https://github.com/desenvolvedor-io/dev-store/compare/v1.0.0...v1.1.0) (2022-04-20)
2+
3+
4+
### Features
5+
6+
* serilog & seq ([d79e675](https://github.com/desenvolvedor-io/dev-store/commit/d79e675f51391c555c6660f4db7deac80865d638))
7+
18
# 1.0.0 (2022-04-20)
29

310

README.md

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77

88
A real-world reference application powered by [desenvolvedor.io](https://desenvolvedor.io/) <img alt="Brasil" src="https://user-images.githubusercontent.com/5068797/161345649-c7184fdc-2bc3-42a9-8fb6-6ffee9c8f9c2.png" width="20" height="14" /> implementing the most common and used technologies to share with the technical community the best way to develop full and complex applications with .NET
99

10-
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/6518989bea914b348c92385dda05f93d)](https://www.codacy.com/manual/EduardoPires/DevStoreProject?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=EduardoPires/DevStoreProject&amp;utm_campaign=Badge_Grade)
11-
[![Build status](https://ci.appveyor.com/api/projects/status/rl2ja69994rt3ei6?svg=true)](https://ci.appveyor.com/project/EduardoPires/DevStoreproject)
10+
---
1211

1312
###### This project was inspired by [EShopOnContainers](https://github.com/dotnet-architecture/eShopOnContainers), however the real motivation was to build it by "our way".
1413

@@ -18,7 +17,7 @@ A real-world reference application powered by [desenvolvedor.io](https://desenvo
1817
If you liked the project or if DevStore is helping you, please give us a star ;)
1918

2019
<p align="center">
21-
<img alt="DevStore" src="https://user-images.githubusercontent.com/5068797/161200961-af22100f-ef9f-43c4-8a56-7ee53dccb0be.png" />
20+
<img alt="DevStore" src="https://user-images.githubusercontent.com/5068797/164293734-a72fbeeb-0965-4413-a624-29e1c56c25df.png" />
2221
</p>
2322

2423
## Want to learn everything to build an app like this? :mortar_board:
@@ -111,11 +110,31 @@ docker-compose up
111110

112111
### If you want to build the local images and run the DevStore application in your Docker enviroment:
113112

113+
This compose will provide one database container each API service.
114+
114115
```
115116
docker-compose -f docker-compose-local.yml up --build
116117
```
118+
119+
### If you prefer save machine resources use the light local compose:
120+
121+
This compose will provide just one database container for all API services.
122+
123+
```
124+
docker-compose -f docker-compose-local-light.yml up --build
125+
```
117126
---
118127

128+
### If you want run locally with VS/VS Code:
129+
130+
You will need:
131+
132+
- Docker
133+
- SQL instance (or container)
134+
- RabbitMQ
135+
136+
So you can edit the Docker compose to just run the database and queue dependencies and save your time.
137+
119138
### If you want Visual Studio with F5 and debug experience:
120139

121140
- You will need at least Visual Studio 2022 and .NET 6.

docker/docker-compose-local.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ services:
2828
image: rabbitmq:3-management
2929
container_name: devstore-rabbit
3030
ports:
31-
- 5672:5672
32-
- 15672:15672
31+
- 5672
32+
- 15672
3333
environment:
3434
RABBITMQ_DEFAULT_USER: "devstore"
3535
RABBITMQ_DEFAULT_PASS: "devstore"

docker/docker-compose.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ services:
55
rabbitmq:
66
image: rabbitmq:3-management
77
container_name: devstore-rabbit
8+
expose:
9+
- 5672
810
environment:
911
RABBITMQ_DEFAULT_USER: "devstore"
1012
RABBITMQ_DEFAULT_PASS: "devstore"
@@ -235,17 +237,21 @@ services:
235237
ports:
236238
- 5341:80
237239
environment:
238-
ACCEPT_EULA: Y
240+
ACCEPT_EULA: "Y"
239241

240242
devstore-server:
241-
image: desenvolvedorio/devstore-server:latest
242-
container_name: devstore-server
243+
image: nginx
243244
restart: always
245+
volumes:
246+
- ./nginx/devstore.conf:/etc/nginx/conf.d/default.conf:ro
247+
- ./nginx/nerdstore-certificate.key:/etc/nginx/nerdstore-certificate.key:ro
248+
- ./nginx/nerdstore-certificate.pem:/etc/nginx/nerdstore-certificate.pem:ro
244249
ports:
245250
- "7500:80"
246251
- "7501:443"
247252
depends_on:
248253
- web-mvc
249254

255+
250256
volumes:
251257
dpkeys:
Binary file not shown.

0 commit comments

Comments
 (0)