Add registry credential management and UI enhancements

source/compose.manager/compose.manager.settings.page

@@ -30,6 +30,8 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
 <script src="<?php autov('/webGui/javascript/jquery.switchbutton.js'); ?>"></script>
 <script src="<?php autov('/webGui/javascript/jquery.filetree.js'); ?>" charset="utf-8"></script>
 <script src="<?php autov('/plugins/compose.manager/javascript/common.js'); ?>" type="text/javascript"></script>
+<script src="<?php autov('/plugins/compose.manager/javascript/qrcode/qrcode.min.js'); ?>" type="text/javascript"></script>
+<script src="<?php autov('/plugins/compose.manager/javascript/credentialManager.js'); ?>" type="text/javascript"></script>
 <style>
     /* Toggle switch overrides */
     #compose-tab-settings .switch-button-background,
@@ -1437,7 +1439,7 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
                 }, 'user', 'debug', 'settings');
             }
 
-            if (settingsUnifiedState.activeTab === 'credits' || settingsUnifiedState.activeTab === 'log') {
+            if (settingsUnifiedState.activeTab === 'credits' || settingsUnifiedState.activeTab === 'log' || settingsUnifiedState.activeTab === 'credentials') {
                 $('#global-settings-actions').addClass('hidden');
             } else {
                 $('#global-settings-actions').removeClass('hidden');
@@ -1649,6 +1651,9 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             } else {
                 stopLogRefresh();
             }
+            if (tabId === 'credentials') {
+                ComposeCredentialManager.load();
+            }
             // Always load backup archives when switching to backup tab
             if (tabId === 'backup') {
                 loadBackupArchives();
@@ -1779,6 +1784,10 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             });
             refreshCronStatus(finalizeInitialUpdates);
         }
+
+        if (savedTab === 'credentials') {
+            ComposeCredentialManager.load();
+        }
     });
 
     function loadLogs() {
@@ -2666,10 +2675,21 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
     <div class="compose-tab active" data-tab="settings"><i class="fa fa-cog fa-fw"></i> _(Settings)_</div>
     <div class="compose-tab" data-tab="updates"><i class="fa fa-refresh fa-fw"></i> _(Updates)_</div>
     <div class="compose-tab" data-tab="backup"><i class="fa fa-archive fa-fw"></i> _(Backup / Restore)_</div>
+    <div class="compose-tab" data-tab="credentials"><i class="fa fa-key fa-fw"></i> _(Credentials)_</div>
     <div class="compose-tab" data-tab="log"><i class="fa fa-file-text-o fa-fw"></i> _(Log)_</div>
     <div class="compose-tab" data-tab="credits"><i class="fa fa-star fa-fw"></i> _(Credits)_</div>
 </div>
 
+<div id="compose-tab-credentials" class="compose-tab-content">
+    <div class="title"><span class="left"><i class="fa fa-key icon"></i>_(Registry Credentials)_</span></div>
+    <p>Store pull credentials locally and assign them to individual stacks.</p>
+    <button type="button" id="add-credential-button"><i class="fa fa-plus"></i> Add credential</button>
+    <table class="tablesorter" style="width:100%;margin-top:16px;">
+        <thead><tr><th>Name</th><th>Provider</th><th>Registry</th><th>Account</th><th>Used by</th><th>Actions</th></tr></thead>
+        <tbody id="credentials-tbody"><tr><td colspan="6" class="credential-empty">Open this tab to load credentials.</td></tr></tbody>
+    </table>
+</div>
+
 <!-- Settings Tab -->
 <div id="compose-tab-settings" class="compose-tab-content active">
     <form name="compose_manager_settings" method="POST" action="/update.php" target="progressFrame">

source/compose.manager/default.cfg

@@ -32,3 +32,4 @@ ONLY_EXPAND_RUNNING_STACKS="false"
 COMPOSE_STATS_RATE_MODE="live"
 COMPOSE_STATS_CUSTOM_INTERVAL_MS="1000"
 DONT_CLOSE_EDITOR_MODAL_ON_OUTSIDE_CLICK="false"
+GITHUB_OAUTH_CLIENT_ID="Ov23lip7HwI4IX2ueC97"

source/compose.manager/event/docker_started

@@ -205,6 +205,9 @@ start_stack() {
     if [ -n "$COMPOSE_SPEC_ENV_FILE_PATH" ]; then
         cmd_args+=(-e "$COMPOSE_SPEC_ENV_FILE_PATH")
     fi
+    if [ -n "$COMPOSE_SPEC_CREDENTIAL_ID" ]; then
+        cmd_args+=(--credential-id "$COMPOSE_SPEC_CREDENTIAL_ID")
+    fi
     for profile in "${COMPOSE_SPEC_PROFILES[@]}"; do
         cmd_args+=(-g "$profile")
     done

source/compose.manager/include/AutoUpdateRunner.php

@@ -128,10 +128,12 @@
             $composeFileList = $stackInfo->buildComposeFileList();
             $envFilePath = $args['envFilePath'] ?? null;
             $projectDirectory = $args['projectDirectory'];
+            $credentialId = $stackInfo->getCredentialId();
         } else {
             $composeFileList = findComposeFile($path);
             $envFilePath = null;
             $projectDirectory = $path;
+            $credentialId = null;
         }
 
         // Allow overriding the shell command via environment for tests; default to sh
@@ -147,6 +149,9 @@
         if ($composeFileList === '' && $projectDirectory !== '') {
             $envPrefix .= 'COMPOSE_PROJECT_DIR=' . escapeshellarg($projectDirectory) . ' ';
         }
+        if ($credentialId !== null && $credentialId !== '') {
+            $envPrefix .= 'COMPOSE_CREDENTIAL_ID=' . escapeshellarg($credentialId) . ' ';
+        }
 
         $cmd = $envPrefix . $shCmd . ' ' . escapeshellarg($script) . " " . escapeshellarg($projectName) . " >/dev/null 2>&1 &";
         exec($cmd);

source/compose.manager/include/ComposeCommandBuilder.php

@@ -27,6 +27,9 @@ public static function buildForAction(StackInfo $stackInfo, string $action, ?str
         self::assertResolvedIdentity($stackInfo, $action);
 
         $args = $stackInfo->buildComposeArgs();
+        $credentialId = in_array($action, ['up', 'update', 'pull'], true)
+            ? trim((string) ($stackInfo->getCredentialId() ?? ''))
+            : '';
 
         return [
             'action' => $action,
@@ -37,6 +40,7 @@ public static function buildForAction(StackInfo $stackInfo, string $action, ?str
             'useDefaultFileDiscovery' => $args['useDefaultFileDiscovery'],
             'profiles' => self::resolveProfilesForAction($stackInfo, $action),
             'stackPath' => $stackPath ?? $stackInfo->path,
+            'credentialId' => $credentialId,
         ];
     }
 

source/compose.manager/include/ComposeManager.php

@@ -402,6 +402,8 @@ function compose_manager_cpu_spec_count($cpuSpec)
 </script>
 <script src="<?php autov('/plugins/compose.manager/javascript/composeManagerPageInit.js'); ?>" type="text/javascript"></script>
 <script src="<?php autov('/plugins/compose.manager/javascript/composeColumnCustomizer.js'); ?>" type="text/javascript"></script>
+<script src="<?php autov('/plugins/compose.manager/javascript/qrcode/qrcode.min.js'); ?>" type="text/javascript"></script>
+<script src="<?php autov('/plugins/compose.manager/javascript/credentialManager.js'); ?>" type="text/javascript"></script>
 <script src="<?php autov('/plugins/compose.manager/javascript/composeManagerMain.js'); ?>" type="text/javascript"></script>
 
 <HTML>
@@ -767,6 +769,15 @@ function compose_manager_cpu_spec_count($cpuSpec)
                             </div>
                         </div>
 
+                        <div class="settings-field">
+                            <label for="settings-credential-id">Registry Credential</label>
+                            <div style="display:flex;gap:8px;align-items:center;">
+                                <select id="settings-credential-id" style="flex:1;"><option value="">Anonymous / no credential</option></select>
+                                <button type="button" id="settings-add-credential" title="Add credential"><i class="fa fa-plus"></i></button>
+                            </div>
+                            <div class="settings-field-help">Used only for pull-capable operations for this stack.</div>
+                        </div>
+
                         <div class="settings-field">
                             <label for="settings-wait-for-healthy">Wait for Healthy</label>
                             <label style="display:flex;align-items:center;gap:8px;font-weight:normal;">