Skip to content

Commit c664b49

Browse files
committed
Standalone bootstrap - process a DBTOOLS_CONNECTION env var
1 parent 217b388 commit c664b49

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/build-and-publish-franken-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ jobs:
4747
file: docker/franken-image/Dockerfile
4848
push: true
4949
tags: ${{ steps.meta.outputs.tags == 'main' && 'unstable' || steps.meta.outputs.tags }}
50-
labels: ${{ steps.meta.outputs.labels }}
50+
annotations: ${{ steps.meta.outputs.annotations }}

docker/franken-image/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc| gpg --dearmor
1313
apt-get update && apt-get install -y postgresql-16
1414

1515
# PHP required extensions
16-
RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql
17-
RUN docker-php-ext-install -j$(nproc) pgsql pdo_pgsql pdo mysqli pdo_mysql zip xml gd curl bcmath
18-
RUN docker-php-ext-enable pdo_pgsql pdo_mysql sodium
16+
RUN install-php-extensions pgsql pdo_pgsql pdo mysqli pdo_mysql zip xml gd curl bcmath
1917

2018
# SQL Server support
2119
ENV ACCEPT_EULA=Y

src/Bridge/Standalone/Bootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static function createApplication(): Application
6363
}
6464
$version ??= 'cli';
6565

66-
$application = new Application('DbTools', $version);
66+
$application = new Application('DbToolsBundle', $version);
6767
$application->setCatchExceptions(true);
6868
$application->setDefaultCommand('list');
6969

@@ -426,7 +426,7 @@ private static function configParseFile(string $filename): array
426426
*/
427427
private static function configGetEnv(array $config): array
428428
{
429-
if (!isset($config['backup_binary'])) {
429+
if (!isset($config['connections'])) {
430430
$config['connections'] = self::getEnv('DBTOOLS_CONNECTION');
431431
}
432432
if (!isset($config['backup_binary'])) {

0 commit comments

Comments
 (0)