Skip to content

Commit

Permalink
Fix pulls cron stopping after first container
Browse files Browse the repository at this point in the history
  • Loading branch information
austinwbest committed May 24, 2024
1 parent 3117bf9 commit 3bd9569
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions root/app/www/public/functions/containers.php
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,13 @@ function skipContainerActions($container, $containers)
{
global $docker, $settingsFile, $stateFile;

$settingsFile = $settingsFile ? $settingsFile : getServerFile('settings');
$stateFile = $stateFile ? $stateFile : getServerFile('state');
$settingsFileData = $settingsFile ? $settingsFile : getServerFile('settings');
$stateFileData = $stateFile ? $stateFile : getServerFile('state');

if ($settingsFile['containers']) {
foreach ($settingsFile['containers'] as $containerHash => $containerSettings) {
if ($settingsFileData['containers']) {
foreach ($settingsFileData['containers'] as $containerHash => $containerSettings) {
if ($containerSettings['blacklist']) {
$containerState = $docker->findContainer(['hash' => $containerHash, 'data' => $stateFile]);
$containerState = $docker->findContainer(['hash' => $containerHash, 'data' => $stateFileData]);

if (str_contains($containerState['Image'], $container)) {
return SKIP_OPTIONAL;
Expand All @@ -320,7 +320,7 @@ function skipContainerActions($container, $containers)
}
}

if ($settingsFile['global']['overrideBlacklist'] == 0) {
if ($settingsFileData['global']['overrideBlacklist'] == 0) {
foreach ($containers as $skip) {
if (str_contains($container, $skip)) {
return SKIP_FORCE;
Expand Down

0 comments on commit 3bd9569

Please sign in to comment.