Merge branch 'main' into feature/create-qualification
This commit is contained in:
commit
45261dfc15
@ -5,7 +5,7 @@ volumes:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
postgres-employee:
|
postgres-employee:
|
||||||
container_name: postgres_employee
|
container_name: ems-db
|
||||||
image: postgres:13.3
|
image: postgres:13.3
|
||||||
volumes:
|
volumes:
|
||||||
- employee_postgres_data:/var/lib/postgresql/data
|
- employee_postgres_data:/var/lib/postgresql/data
|
||||||
@ -17,9 +17,8 @@ services:
|
|||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
|
|
||||||
employee:
|
employee:
|
||||||
container_name: employee
|
container_name: ems-api
|
||||||
image: berndheidemann/employee-management-service:1.1.3
|
image: berndheidemann/employee-management-service:1.1.3
|
||||||
# image: berndheidemann/employee-management-service_without_keycloak:1.1
|
|
||||||
environment:
|
environment:
|
||||||
spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db
|
spring.datasource.url: jdbc:postgresql://postgres-employee:5432/employee_db
|
||||||
spring.datasource.username: employee
|
spring.datasource.username: employee
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
<mat-icon>edit</mat-icon>
|
<mat-icon>edit</mat-icon>
|
||||||
</button>
|
</button>
|
||||||
<button mat-icon-button color="warn" [matTooltip]="'Delete employee'" (click)="openDeleteDialogue(employee)">
|
<button mat-icon-button color="warn" [matTooltip]="'Delete employee'" (click)="openDeleteDialogue(employee)">
|
||||||
<mat-icon>delete</mat-icon>
|
🗑️
|
||||||
</button>
|
</button>
|
||||||
</td>
|
</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
Reference in New Issue
Block a user