Compare commits

...

17 Commits

Author SHA1 Message Date
Simon L.
f976c55726 increase to v13.1.0
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-05-22 12:48:13 +02:00
Simon L.
1514c05435 Fix docker registry and community containers (#8091) 2026-05-22 12:43:12 +02:00
Simon L.
55c08cab00 aio-interface: do not cache the containers, logs and setup screen as it shows credentials (#8161) 2026-05-22 12:22:32 +02:00
Simon L.
2b1ec334e8 build(deps): bump docker from 29.5.1-cli to 29.5.2-cli in /Containers/mastercontainer (#8192) 2026-05-22 10:11:10 +02:00
Simon L.
99704807d0 PHP dependency updates (#8190) 2026-05-22 10:10:56 +02:00
Simon L.
dabb7d0224 server.config.php: fix serverid closing bracket
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-05-22 10:06:32 +02:00
dependabot[bot]
1a2d168a7f build(deps): bump docker in /Containers/mastercontainer
Bumps docker from 29.5.1-cli to 29.5.2-cli.

---
updated-dependencies:
- dependency-name: docker
  dependency-version: 29.5.2-cli
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2026-05-22 04:22:33 +00:00
lonode
abaea7b4c2 change case
Signed-off-by: lonode <32384862+lonode@users.noreply.github.com>
2026-05-21 17:42:21 +02:00
szaimen
a1c818bc38 php dependency updates
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-05-21 13:01:02 +00:00
Simon L.
1d546bbb59 aio-interface: do not cache the containers, logs and setup screen as it shows credentials
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-05-21 12:14:46 +02:00
Simon L.
5a474d92d9 notify-push: fix startup on ipv6 disabled servers (#8188) 2026-05-21 12:06:28 +02:00
Simon L.
795baf903b server.config.php: downstream sync serverid upstream change (#8187) 2026-05-21 12:01:49 +02:00
Simon L.
b4c0266461 notify-push: fix startup on ipv6 disabled servers
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-05-21 10:53:49 +02:00
Simon L.
3a988938b2 server.config.php: downstream sync serverid upstream change
Signed-off-by: Simon L. <szaimen@e.mail.de>
2026-05-21 10:48:37 +02:00
lonode
3517ba3039 apply suggestion
Signed-off-by: lonode <32384862+lonode@users.noreply.github.com>
2026-05-19 15:13:51 +02:00
lonode
ff7443b566 add support for multicontainer on community containers
Signed-off-by: lonode <32384862+lonode@users.noreply.github.com>
2026-05-13 14:35:13 +02:00
lonode
fedb0a65df Add support for library (official) images
Signed-off-by: lonode <32384862+lonode@users.noreply.github.com>
2026-05-13 14:35:08 +02:00
8 changed files with 56 additions and 23 deletions

View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:latest
# Docker CLI is a requirement
FROM docker:29.5.1-cli AS docker
FROM docker:29.5.2-cli AS docker
ARG CADDY_REMOTE_HOST_HASH=e80a9931765a8dbcbb47db415863387f0df0e1b3

View File

@@ -1,4 +1,4 @@
<?php
$CONFIG = array (
'serverid' => crc32(gethostname()) % 512,
'serverid' => hexdec(hash('xxh32', gethostname())) & 0x1FF,
);

View File

@@ -42,6 +42,15 @@ if ! [ -f /var/www/html/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push ] &&
exit 1
fi
# Logic for ipv6 disabled servers
BIND="::"
if grep -q "1" /sys/module/ipv6/parameters/disable \
|| grep -q "1" /proc/sys/net/ipv6/conf/all/disable_ipv6 \
|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
BIND="0.0.0.0"
fi
export BIND
echo "notify-push was started"

24
php/composer.lock generated
View File

@@ -64,16 +64,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "7.10.2",
"version": "7.10.3",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "aed36fd5fb4844f284252a999d9abf35d3a9a1ae"
"reference": "47ba23c7a55247e2e1b7407aca90e9bbed0d9d86"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aed36fd5fb4844f284252a999d9abf35d3a9a1ae",
"reference": "aed36fd5fb4844f284252a999d9abf35d3a9a1ae",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/47ba23c7a55247e2e1b7407aca90e9bbed0d9d86",
"reference": "47ba23c7a55247e2e1b7407aca90e9bbed0d9d86",
"shasum": ""
},
"require": {
@@ -171,7 +171,7 @@
],
"support": {
"issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.10.2"
"source": "https://github.com/guzzle/guzzle/tree/7.10.3"
},
"funding": [
{
@@ -187,20 +187,20 @@
"type": "tidelift"
}
],
"time": "2026-05-20T11:58:52+00:00"
"time": "2026-05-20T22:59:19+00:00"
},
{
"name": "guzzlehttp/promises",
"version": "2.3.1",
"version": "2.4.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/promises.git",
"reference": "d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e"
"reference": "09e8a212562fb1fb6a512c4156ed71525969d6c2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e",
"reference": "d2d8dfae4757f384d630fdffc2d8d6618d8f4c5e",
"url": "https://api.github.com/repos/guzzle/promises/zipball/09e8a212562fb1fb6a512c4156ed71525969d6c2",
"reference": "09e8a212562fb1fb6a512c4156ed71525969d6c2",
"shasum": ""
},
"require": {
@@ -254,7 +254,7 @@
],
"support": {
"issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/2.3.1"
"source": "https://github.com/guzzle/promises/tree/2.4.1"
},
"funding": [
{
@@ -270,7 +270,7 @@
"type": "tidelift"
}
],
"time": "2026-05-19T18:30:48+00:00"
"time": "2026-05-20T22:57:30+00:00"
},
{
"name": "guzzlehttp/psr7",

View File

@@ -181,8 +181,10 @@ $app->get('/containers', function (Request $request, Response $response, array $
'community_containers' => $configurationManager->listAvailableCommunityContainers(),
'community_containers_enabled' => $configurationManager->aioCommunityContainers,
'bypass_container_update' => $bypass_container_update,
]);
// Do not cache the page as it shows credentials
])->withHeader('Cache-Control', 'no-store');
})->setName('profile');
$app->get('/login', function (Request $request, Response $response, array $args) use ($container) {
$view = Twig::fromRequest($request);
/** @var \AIO\Docker\DockerActionManager $dockerActionManager */
@@ -191,6 +193,7 @@ $app->get('/login', function (Request $request, Response $response, array $args)
'is_login_allowed' => $dockerActionManager->isLoginAllowed(),
]);
});
$app->get('/setup', function (Request $request, Response $response, array $args) use ($container) {
$view = Twig::fromRequest($request);
/** @var \AIO\Data\Setup $setup */
@@ -209,8 +212,10 @@ $app->get('/setup', function (Request $request, Response $response, array $args)
[
'password' => $setup->Setup(),
]
);
// Do not cache the page as it shows credentials
)->withHeader('Cache-Control', 'no-store');
});
$app->get('/log', function (Request $request, Response $response, array $args) use ($container) {
$params = $request->getQueryParams();
$id = $params['id'] ?? '';
@@ -218,7 +223,13 @@ $app->get('/log', function (Request $request, Response $response, array $args) u
throw new DI\NotFoundException();
}
$view = Twig::fromRequest($request);
return $view->render($response, 'log.twig', ['id' => $id]);
return $view->render(
$response, 'log.twig',
[
'id' => $id
]
// Do not cache the page as it might shows credentials
)->withHeader('Cache-Control', 'no-store');
});
// Auth Redirector

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);

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(

View File

@@ -1 +1 @@
13.0.4
13.1.0