kor-elf/mdhub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: kor-elf:e5c4abdf28389eca1e627081e16b3cf8b5f9f2c5
Branches Tags
kor-elf:main
kor-elf:develop
kor-elf:0.1.0-beta
..
compare: kor-elf:a949eae77723ce939eed3997d33e4b1de70353cb
Branches Tags
kor-elf:develop
kor-elf:main
kor-elf:0.1.0-beta

No commits in common. "e5c4abdf28389eca1e627081e16b3cf8b5f9f2c5" and "a949eae77723ce939eed3997d33e4b1de70353cb" have entirely different histories.
e5c4abdf28 ... a949eae777

6 changed files with 6 additions and 23 deletions
Show Stats Expand all files Collapse all files

5
app/application/app/Helpers/Helpers.php
View File

@ -38,9 +38,4 @@ public static function shortDigest(string $digest): string
$digest = Str::of($digest)->explode(':', 2)->last(); $digest = Str::of($digest)->explode(':', 2)->last();
return Str::of($digest)->take(12)->toString(); return Str::of($digest)->take(12)->toString();
} }
public static function dockerServiceAddress(): string
{
return Str::of(config('registry.service_http'))->remove(['http://', 'https://'])->toString();
}
} }

3
app/application/app/Services/Site/AccessTokenService.php
View File

@ -5,7 +5,6 @@
use App\Dto\QuerySettingsDto; use App\Dto\QuerySettingsDto;
use App\Dto\Service\Site\AccessTokens\StoreUpdate; use App\Dto\Service\Site\AccessTokens\StoreUpdate;
use App\Enums\AccessTokenPermission; use App\Enums\AccessTokenPermission;
use App\Helpers\Helpers;
use App\Models\User; use App\Models\User;
use App\Repositories\AccessTokenRepository; use App\Repositories\AccessTokenRepository;
use App\ServiceResults\ServiceResultArray; use App\ServiceResults\ServiceResultArray;
@ -40,7 +39,7 @@ public function create(User $user): ServiceResultError | ServiceResultArray
{ {
return $this->result([ return $this->result([
'user' => $user, 'user' => $user,
'serviceAddress' => Helpers::dockerServiceAddress(), 'serviceAddress' => config('registry.service_http'),
'permissions' => AccessTokenPermission::toCollection()->pluck('title', 'value')->toArray(), 'permissions' => AccessTokenPermission::toCollection()->pluck('title', 'value')->toArray(),
]); ]);
} }

3
app/application/app/Services/Site/RepositoryService.php
View File

@ -5,7 +5,6 @@
use App\Dto\Builder\Repository as RepositoryBuilder; use App\Dto\Builder\Repository as RepositoryBuilder;
use App\Dto\QuerySettingsDto; use App\Dto\QuerySettingsDto;
use App\Dto\Service\Site\Repository\StoreUpdate; use App\Dto\Service\Site\Repository\StoreUpdate;
use App\Helpers\Helpers;
use App\Models\Repository; use App\Models\Repository;
use App\Models\User; use App\Models\User;
use App\Repositories\RepositoryRepository; use App\Repositories\RepositoryRepository;
@ -66,7 +65,7 @@ public function repository(string $username, string $repositoryName, ?User $user
return $this->result([ return $this->result([
'repository' => $repository, 'repository' => $repository,
'pageUser' => $pageUser, 'pageUser' => $pageUser,
'serviceAddress' => Helpers::dockerServiceAddress(), 'serviceAddress' => config('registry.service_http'),
]); ]);
} }

3
app/application/app/Services/Site/TagRepositoryService.php
View File

@ -3,7 +3,6 @@
namespace App\Services\Site; namespace App\Services\Site;
use App\Dto\QuerySettingsDto; use App\Dto\QuerySettingsDto;
use App\Helpers\Helpers;
use App\Models\User; use App\Models\User;
use App\Repositories\RepositoryRepository; use App\Repositories\RepositoryRepository;
use App\Repositories\TagRepositoryRepository; use App\Repositories\TagRepositoryRepository;
@ -56,7 +55,7 @@ public function tags(string $username, string $repositoryName, QuerySettingsDto
'tags' => $tags, 'tags' => $tags,
'repository' => $repository, 'repository' => $repository,
'pageUser' => $pageUser, 'pageUser' => $pageUser,
'serviceAddress' => Helpers::dockerServiceAddress(), 'serviceAddress' => config('registry.service_http'),
]); ]);
} }

3
docker-compose-prod.yml
View File

@ -12,9 +12,6 @@ services:
- captcha-app - captcha-app
ports: ports:
- ${DOCKER_APP_PORT}:9000 - ${DOCKER_APP_PORT}:9000
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '"172.16.0.0/12"'
volumes: volumes:
- ./app/application:/var/www/html - ./app/application:/var/www/html
- ./certs:/var/www/html/resources/certs:ro - ./certs:/var/www/html/resources/certs:ro

12
docker-compose-prod_docker-hub.yml
View File

@ -1,8 +1,7 @@
version: '3.7' version: '3.7'
services: services:
app: app:
# image: korelf/mdhub:0.1.0-beta # docker hub image: korelf/mdhub:0.1.0-beta
image: docker.mdhub.kor-elf.net/kor-elf/mdhub:0.1.0-beta #MDHub
# restart: always # restart: always
depends_on: depends_on:
- db - db
@ -11,16 +10,12 @@ services:
ports: ports:
- ${DOCKER_APP_PORT}:9000 - ${DOCKER_APP_PORT}:9000
env_file: app/.env env_file: app/.env
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '"172.16.0.0/12"'
volumes: volumes:
- ./app/storage/app:/var/www/html/storage/app - ./app/storage/app:/var/www/html/storage/app
- ./app/storage/logs:/var/www/html/storage/logs - ./app/storage/logs:/var/www/html/storage/logs
- ./certs:/var/www/html/resources/certs:ro - ./certs:/var/www/html/resources/certs:ro
queue: queue:
# image: korelf/mdhub:0.1.0-beta # docker hub image: korelf/mdhub:0.1.0-beta
image: docker.mdhub.kor-elf.net/kor-elf/mdhub:0.1.0-beta #MDHub
# restart: always # restart: always
depends_on: depends_on:
- db - db
@ -33,8 +28,7 @@ services:
- ./app/storage/logs:/var/www/html/storage/logs - ./app/storage/logs:/var/www/html/storage/logs
- ./certs:/var/www/html/resources/certs:ro - ./certs:/var/www/html/resources/certs:ro
scheduler: scheduler:
# image: korelf/mdhub:0.1.0-beta # docker hub image: korelf/mdhub:0.1.0-beta
image: docker.mdhub.kor-elf.net/kor-elf/mdhub:0.1.0-beta #MDHub
# restart: always # restart: always
depends_on: depends_on:
- db - db