Standalone bootstrap - process a DBTOOLS_CONNECTION env var

makinacorpus · Dec 6, 2024 · c664b49 · c664b49
1 parent 217b388
commit c664b49
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/build-and-publish-franken-image.yml b/.github/workflows/build-and-publish-franken-image.yml
@@ -47,4 +47,4 @@ jobs:
         file: docker/franken-image/Dockerfile
         push: true
         tags: ${{ steps.meta.outputs.tags == 'main' && 'unstable' || steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
+        annotations: ${{ steps.meta.outputs.annotations }}
diff --git a/docker/franken-image/Dockerfile b/docker/franken-image/Dockerfile
@@ -13,9 +13,7 @@ RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc| gpg --dearmor
     apt-get update && apt-get install -y postgresql-16
 
 # PHP required extensions
-RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql
-RUN docker-php-ext-install -j$(nproc) pgsql pdo_pgsql pdo mysqli pdo_mysql zip xml gd curl bcmath
-RUN docker-php-ext-enable pdo_pgsql pdo_mysql sodium
+RUN install-php-extensions pgsql pdo_pgsql pdo mysqli pdo_mysql zip xml gd curl bcmath
 
 # SQL Server support
 ENV ACCEPT_EULA=Y

diff --git a/src/Bridge/Standalone/Bootstrap.php b/src/Bridge/Standalone/Bootstrap.php
@@ -63,7 +63,7 @@ public static function createApplication(): Application
         }
         $version ??= 'cli';
 
-        $application = new Application('DbTools', $version);
+        $application = new Application('DbToolsBundle', $version);
         $application->setCatchExceptions(true);
         $application->setDefaultCommand('list');
 
@@ -426,7 +426,7 @@ private static function configParseFile(string $filename): array
      */
     private static function configGetEnv(array $config): array
     {
-        if (!isset($config['backup_binary'])) {
+        if (!isset($config['connections'])) {
             $config['connections'] = self::getEnv('DBTOOLS_CONNECTION');
         }
         if (!isset($config['backup_binary'])) {