daenamnu/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-05-30 23:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix docker registry and community containers (#8091)

Browse Source
This commit is contained in:
Simon L.
2026-05-22 12:43:12 +02:00
committed by GitHub
parent 55c08cab00 abaea7b4c2
commit 1514c05435
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
php/src/ContainerDefinitionFetcher.php
View File

@@ -52,14 +52,18 @@ readonly class ContainerDefinitionFetcher {
$standardContainerNames = array_column($data['aio_services_v1'], 'container_name');
$additionalContainerNames = [];
$additionalTopLevelContainerNames = [];
foreach ($this->configurationManager->aioCommunityContainers as $communityContainer) {
if ($communityContainer !== '') {
$path = DataConst::GetCommunityContainersDirectory() . '/' . $communityContainer . '/' . $communityContainer . '.json';
$additionalData = json_decode((string)file_get_contents($path), true, 512, JSON_THROW_ON_ERROR);
$data = array_merge_recursive($data, $additionalData);
foreach ($additionalData['aio_services_v1'] as $additionalEntry) {
$additionalContainerNames[] = $additionalEntry['container_name'];
}
if (isset($additionalData['aio_services_v1'][0]['display_name']) && $additionalData['aio_services_v1'][0]['display_name'] !== '') {
// Store container_name of community containers in variable for later
$additionalContainerNames[] = $additionalData['aio_services_v1'][0]['container_name'];
// Store main container_name of community containers in variable for later
$additionalTopLevelContainerNames[] = $additionalData['aio_services_v1'][0]['container_name'];
}
}
}
@@ -176,7 +180,7 @@ readonly class ContainerDefinitionFetcher {
if ($entry['container_name'] === 'nextcloud-aio-apache') {
// Add community containers first and default ones last so that aio_variables works correctly
$valueDependsOnTemp = [];
foreach ($additionalContainerNames as $containerName) {
foreach ($additionalTopLevelContainerNames as $containerName) {
$valueDependsOnTemp[] = $containerName;
}
$valueDependsOn = array_merge_recursive($valueDependsOnTemp, $valueDependsOn);

13
php/src/Docker/DockerHubManager.php
View File

@@ -3,8 +3,6 @@ declare(strict_types=1);
namespace AIO\Docker;
use AIO\ContainerDefinitionFetcher;
use AIO\Data\ConfigurationManager;
use GuzzleHttp\Client;
readonly class DockerHubManager {
@@ -15,6 +13,16 @@ readonly class DockerHubManager {
$this->guzzleClient = new Client();
}
// Official Docker Hub images need the library/ prefix when using the registry API directly.
private function normalizeImageName(string $name): string {
if (!str_contains($name, '/')) {
return 'library/' . $name;
}
return $name;
}
public function GetLatestDigestOfTag(string $name, string $tag) : ?string {
$cacheKey = 'dockerhub-manifest-' . $name . $tag;
@@ -24,6 +32,7 @@ readonly class DockerHubManager {
}
// If one of the links below should ever become outdated, we can still upgrade the mastercontainer via the webinterface manually by opening '/api/docker/getwatchtower'
$name = $this->normalizeImageName($name);
try {
$authTokenRequest = $this->guzzleClient->request(