app/application/app/Helpers/Helpers.php

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

app/application/app/Services/Site/AccessTokenService.php

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

app/application/app/Services/Site/RepositoryService.php

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

app/application/app/Services/Site/TagRepositoryService.php

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

docker-compose-prod.yml

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

docker-compose-prod_docker-hub.yml

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