Skip to content

Commit 108afb7

Browse files
committed
Template fix
1 parent d29576d commit 108afb7

11 files changed

+35
-51
lines changed

templates/template/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"classifications": [
55
"Web/ASP.NET"
66
],
7-
"name": "Genocs: Architecture for .NET Core",
7+
"name": "Genocs: Service Template for .NET Core",
88
"identity": "Genocs.ServiceTemplate",
99
"groupIdentity": "Genocs.ServiceTemplate",
1010
"shortName": "servicetemplate",

templates/template/Genocs.Template-kubernetes-ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ spec:
1212
pathType: Prefix
1313
backend:
1414
service:
15-
name: keyvaultreader
15+
name: servicetemplate-webapi
1616
port:
1717
number: 80
1818
- path: /bar
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: keyvaultreader
4+
name: servicetemplate
55
labels:
6-
app: keyvaultreader-webapi
6+
app: servicetemplate-webapi
77
spec:
88
selector:
99
matchLabels:
10-
app: keyvaultreader-webapi
10+
app: servicetemplate-webapi
1111
replicas: 1
1212
template:
1313
metadata:
1414
labels:
15-
app: keyvaultreader-webapi
15+
app: servicetemplate-webapi
1616
spec:
1717
containers:
18-
- name: keyvaultreader-webapi
19-
image: genocs/keyvaultreader:1.1.362
18+
- name: servicetemplate-webapi
19+
image: genocs/servicetemplate:latest
2020
env:
2121
- name: ASPNETCORE_ENVIRONMENT
2222
value: "Development"
2323
- name: ApiClients__SecondUrl
24-
value: "http://keyvaultreader.default.svc.cluster.local"
24+
value: "http://servicetemplate.default.svc.cluster.local"
2525
resources:
2626
requests:
2727
cpu: 100m
@@ -35,10 +35,10 @@ spec:
3535
apiVersion: v1
3636
kind: Service
3737
metadata:
38-
name: keyvaultreader
38+
name: servicetemplate
3939
spec:
4040
# type: LoadBalancer
4141
ports:
4242
- port: 80
4343
selector:
44-
app: keyvaultreader-webapi
44+
app: servicetemplate-webapi

templates/template/Genocs.Template-kubernetes-worker.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: nservicebus
4+
name: servicetemplate
55
labels:
6-
app: nservicebus-busworker
6+
app: servicetemplate-worker
77
spec:
88
selector:
99
matchLabels:
10-
app: nservicebus-busworker
10+
app: servicetemplate-worker
1111
replicas: 1
1212
template:
1313
metadata:
1414
labels:
15-
app: nservicebus-busworker
15+
app: servicetemplate-worker
1616
spec:
1717
containers:
18-
- name: nservicebus-busworker
19-
image: genocsacr.azurecr.io/nservicebusworker:1.1.370
18+
- name: servicetemplate-worker
19+
image: genocsacr.azurecr.io/servicetemplate-worker:latest
2020
env:
2121
- name: ParticularOptions__TransportConnectionString
2222
value: "<<fill_with-your_data>>"
@@ -35,10 +35,10 @@ spec:
3535
apiVersion: v1
3636
kind: Service
3737
metadata:
38-
name: nservicebus
38+
name: servicetemplate
3939
spec:
4040
# type: LoadBalancer
4141
ports:
4242
- port: 80
4343
selector:
44-
app: nservicebus-busworker
44+
app: servicetemplate-worker

templates/template/README.md

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# The Clean Architecture Sample Implementation with .NET Core
1+
# The Genocs Enterprise Service Template Implementation with .NET Core
22

33

4-
Sample implementation of the **Clean Architecture Principles with .NET Core**. Use cases as central organizing structure, decoupled from frameworks and technology details. Built with small components that are developed and tested in isolation.
4+
Sample implementation of the **Genocs Enterprise Service Principles with .NET Core**. Use cases as central organizing structure, decoupled from frameworks and technology details. Built with small components that are developed and tested in isolation.
55

66
----
77

@@ -12,8 +12,8 @@ Sample implementation of the **Clean Architecture Principles with .NET Core**. U
1212
## Usage
1313

1414
```sh
15-
dotnet new -i Genocs.CleanArchitecture::1.7.2
16-
dotnet new cleanarchitecture -n "MyCompany.MyProject"
15+
dotnet new -i Genocs.ServiceTemplate::1.0.0
16+
dotnet new servicetemplate -n "Company.Project"
1717
```
1818

1919
To get the Clean Architecture updates hit the `WATCH` button.
@@ -96,14 +96,13 @@ The folder docker-infrastructure contains the docker-compose file and everything
9696

9797
This example implement the enterprise service bus through three different library.
9898

99-
- NService Bus
10099
- Rebus
101100
- Bare implementation with Azure Service bus
102101

103102

104103
## Containers and orchestrators
105104

106-
The example is ready to create the docker images for both WebApi and BusWorker
105+
The example is ready to create the docker images for both WebApi and Worker
107106

108107

109108
## Contributing
@@ -1407,27 +1406,27 @@ deploy_script:
14071406
The project build two different images. One for the the Web API and one for the bus worker.
14081407
14091408
```sh
1410-
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
1409+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
14111410
WORKDIR /app
14121411

14131412
# Copy everything else and build
14141413
COPY . .
14151414
RUN dotnet publish src/{MyCompany.MyProject}.WebApi -c release -o out
14161415

14171416
# Build runtime image
1418-
FROM mcr.microsoft.com/dotnet/aspnet:5.0
1417+
FROM mcr.microsoft.com/dotnet/aspnet:7.0
14191418
WORKDIR /app
14201419
COPY --from=build /app/out .
14211420
ENV ASPNETCORE_URLS http://*:80
14221421
ENV ASPNETCORE_ENVIRONMENT Docker
1423-
ENTRYPOINT dotnet {MyCompany.MyProject}.WebApi.dll
1422+
ENTRYPOINT dotnet {Company.Project}.WebApi.dll
14241423
```
14251424

14261425
To build the docker images
14271426

14281427
```sh
1429-
docker build -t mycompany/myproject.webapi -f .\src\Genocs.MicroserviceLight.Template.WebApi\Dockerfile .
1430-
docker build -t mycompany/myproject.worker -f .\src\Genocs.MicroserviceLight.Template.BusWorker\Dockerfile .
1428+
docker build -t company/project.webapi -f .\src\Genocs.MicroserviceLight.Template.WebApi\Dockerfile .
1429+
docker build -t company/project.worker -f .\src\Genocs.MicroserviceLight.Template.BusWorker\Dockerfile .
14311430
```
14321431

14331432

@@ -1461,22 +1460,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
14611460
<!-- prettier-ignore -->
14621461
<table>
14631462
<tr>
1464-
<td align="center"><a href="https://paulovich.net"><img src="https://avatars3.githubusercontent.com/u/7133698?v=4" width="100px;" alt="Ivan Paulovich"/><br /><sub><b>Ivan Paulovich</b></sub></a><br /><a href="#design-ivanpaulovich" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=ivanpaulovich" title="Tests">⚠️</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=ivanpaulovich" title="Code">💻</a></td>
1465-
<td align="center"><a href="https://spelos.net/"><img src="https://avatars3.githubusercontent.com/u/21304428?v=4" width="100px;" alt="Petr Sedláček"/><br /><sub><b>Petr Sedláček</b></sub></a><br /><a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=petrspelos" title="Tests">⚠️</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=petrspelos" title="Code">💻</a></td>
1466-
<td align="center"><a href="https://github.com/luizgustavogp"><img src="https://avatars2.githubusercontent.com/u/5147169?v=4" width="100px;" alt="Gus"/><br /><sub><b>Gus</b></sub></a><br /><a href="#design-luizgustavogp" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=luizgustavogp" title="Tests">⚠️</a></td>
1467-
<td align="center"><a href="https://github.com/arulconsultant"><img src="https://avatars0.githubusercontent.com/u/47856951?v=4" width="100px;" alt="arulconsultant"/><br /><sub><b>arulconsultant</b></sub></a><br /><a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=arulconsultant" title="Tests">⚠️</a></td>
1468-
<td align="center"><a href="https://github.com/guilhermeps"><img src="https://avatars1.githubusercontent.com/u/38736244?v=4" width="100px;" alt="Guilherme Silva"/><br /><sub><b>Guilherme Silva</b></sub></a><br /><a href="#design-guilhermeps" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=guilhermeps" title="Tests">⚠️</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=guilhermeps" title="Code">💻</a></td>
1469-
</tr>
1470-
<tr>
1471-
<td align="center"><a href="https://github.com/ostorc"><img src="https://avatars1.githubusercontent.com/u/13519594?v=4" width="100px;" alt="Ondřej Štorc"/><br /><sub><b>Ondřej Štorc</b></sub></a><br /><a href="#design-ostorc" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=ostorc" title="Tests">⚠️</a></td>
1472-
<td align="center"><a href="https://github.com/MarlonMiranda"><img src="https://avatars3.githubusercontent.com/u/12774904?v=4" width="100px;" alt="Marlon Miranda da Silva"/><br /><sub><b>Marlon Miranda da Silva</b></sub></a><br /><a href="#design-MarlonMiranda" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=MarlonMiranda" title="Tests">⚠️</a></td>
1473-
<td align="center"><a href="https://github.com/NicoCG"><img src="https://avatars1.githubusercontent.com/u/33652180?v=4" width="100px;" alt="NicoCG"/><br /><sub><b>NicoCG</b></sub></a><br /><a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=NicoCG" title="Tests">⚠️</a></td>
1474-
<td align="center"><a href="https://stackoverflow.com/users/2072198/fals"><img src="https://avatars2.githubusercontent.com/u/3750960?v=4" width="100px;" alt="Filipe Augusto Lima de Souza"/><br /><sub><b>Filipe Augusto Lima de Souza</b></sub></a><br /><a href="#design-fals" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=fals" title="Tests">⚠️</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=fals" title="Code">💻</a></td>
1475-
<td align="center"><a href="https://github.com/sshaw-sml"><img src="https://avatars3.githubusercontent.com/u/33876744?v=4" width="100px;" alt="sshaw-sml"/><br /><sub><b>sshaw-sml</b></sub></a><br /><a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=sshaw-sml" title="Tests">⚠️</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=sshaw-sml" title="Code">💻</a></td>
1476-
</tr>
1477-
<tr>
1478-
<td align="center"><a href="https://github.com/matheusneder"><img src="https://avatars1.githubusercontent.com/u/6011646?v=4" width="100px;" alt="Matheus Neder"/><br /><sub><b>Matheus Neder</b></sub></a><br /><a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=matheusneder" title="Tests">⚠️</a></td>
1479-
<td align="center"><a href="https://github.com/matiienkodimitri"><img src="https://avatars2.githubusercontent.com/u/53822759?v=4" width="100px;" alt="димитрий матиенко"/><br /><sub><b>димитрий матиенко</b></sub></a><br /><a href="#design-matiienkodimitri" title="Design">🎨</a> <a href="https://github.com/ivanpaulovich/clean-architecture-manga/commits?author=matiienkodimitri" title="Tests">⚠️</a></td>
1463+
<td align="center"><a href="https://github.com/giovanninocco"><img src="https://avatars.githubusercontent.com/u/6323824?v=4" width="100px;" alt="Giovanni Emananuele Nocco"/><br /><sub><b>Giovanni Nocco</b></sub></a><br /><a href="https://github.com/Genocs/genocs-library/commits?author=giovanninocco" title="Tests">⚠️</a></td>
14801464
</tr>
14811465
</table>
14821466

File renamed without changes.

templates/template/docker-compose.override.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
version: '3.9'
22

33
services:
4-
genocs.template.webapi:
4+
servicetemplate.webapi:
55
environment:
66
- ASPNETCORE_ENVIRONMENT=Development
77
- ASPNETCORE_URLS=https://+:443;http://+:80
88
networks:
99
- genocs
1010
ports:
11-
- "80"
12-
- "443"
11+
- 80
12+
- 443
1313
volumes:
1414
- ${APPDATA}/Microsoft/UserSecrets:/root/.microsoft/usersecrets:ro
1515
- ${APPDATA}/ASP.NET/Https:/root/.aspnet/https:ro

0 commit comments

Comments
 (0)