Skip to content

Commit 563050d

Browse files
authored
Merge pull request #47 from aspnetboilerplate/docker-support
change docker container image names
2 parents 83c5478 + ea90ed4 commit 563050d

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

aspnet-core/build/build-mvc.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dotnet publish --output (Join-Path $outputFolder "Mvc")
2525
# Mvc
2626
Set-Location (Join-Path $outputFolder "Mvc")
2727

28-
docker rmi zero/mvc -f
29-
docker build -t zero/mvc .
28+
docker rmi abp/mvc -f
29+
docker build -t abp/mvc .
3030

3131
## DOCKER COMPOSE FILES #######################################################
3232

aspnet-core/build/build-with-ng.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ $ngConfigPath = Join-Path $outputFolder "ng/assets/appconfig.json"
3939
# Host
4040
Set-Location (Join-Path $outputFolder "Host")
4141

42-
docker rmi zero/host -f
43-
docker build -t zero/host .
42+
docker rmi abp/host -f
43+
docker build -t abp/host .
4444

4545
# Angular UI
4646
Set-Location (Join-Path $outputFolder "ng")
4747

48-
docker rmi zero/ng -f
49-
docker build -t zero/ng .
48+
docker rmi abp/ng -f
49+
docker build -t abp/ng .
5050

5151
## DOCKER COMPOSE FILES #######################################################
5252

aspnet-core/docker/mvc/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ version: '2'
22

33
services:
44

5-
zero_mvc:
6-
image: zero/mvc
5+
abp_mvc:
6+
image: abp/mvc
77
environment:
88
- ASPNETCORE_ENVIRONMENT=Staging
99
ports:

aspnet-core/docker/ng/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ version: '2'
22

33
services:
44

5-
zero_host:
6-
image: zero/host
5+
abp_host:
6+
image: abp/host
77
environment:
88
- ASPNETCORE_ENVIRONMENT=Staging
99
ports:
1010
- "9901:80"
1111
volumes:
1212
- "./Host-Logs:/app/App_Data/Logs"
1313

14-
zero_ng:
15-
image: zero/ng
14+
abp_ng:
15+
image: abp/ng
1616
ports:
1717
- "9902:80"

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,20 @@ namespace AbpCompanyName.AbpProjectName.Users
1515
public class UserAppService : AbpProjectNameAppServiceBase, IUserAppService
1616
{
1717
private readonly IRepository<User, long> _userRepository;
18-
private readonly IPermissionManager _permissionManager;
1918
private readonly IPasswordHasher<User> _passwordHasher;
2019

2120
public UserAppService(
2221
IRepository<User, long> userRepository,
23-
IPermissionManager permissionManager,
2422
IPasswordHasher<User> passwordHasher)
2523
{
2624
_userRepository = userRepository;
27-
_permissionManager = permissionManager;
2825
_passwordHasher = passwordHasher;
2926
}
3027

3128
public async Task ProhibitPermission(ProhibitPermissionInput input)
3229
{
3330
var user = await UserManager.GetUserByIdAsync(input.UserId);
34-
var permission = _permissionManager.GetPermission(input.PermissionName);
31+
var permission = PermissionManager.GetPermission(input.PermissionName);
3532

3633
await UserManager.ProhibitPermissionAsync(user, permission);
3734
}

0 commit comments

Comments
 (0)