Skip to content

Commit 26ba322

Browse files
infra: Sync with upstream.
1 parent cbffd18 commit 26ba322

2 files changed

Lines changed: 15 additions & 1 deletion

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN a2enmod headers rewrite remoteip ;\
8080
} > /etc/apache2/conf-available/remoteip.conf;\
8181
a2enconf remoteip
8282

83-
ENV NEXTCLOUD_VERSION 22.2.0
83+
ENV NEXTCLOUD_VERSION 23.0.0
8484

8585
RUN set -ex; \
8686
fetchDeps=" \

config/autoconfig.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,27 @@
66
$AUTOCONFIG['dbtype'] = 'sqlite';
77
$AUTOCONFIG['dbname'] = getenv('SQLITE_DATABASE');
88
$autoconfig_enabled = true;
9+
} elseif (getenv('MYSQL_DATABASE_FILE') && getenv('MYSQL_USER_FILE') && getenv('MYSQL_PASSWORD_FILE') && getenv('MYSQL_HOST')) {
10+
$AUTOCONFIG['dbtype'] = 'mysql';
11+
$AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('MYSQL_DATABASE_FILE')));
12+
$AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('MYSQL_USER_FILE')));
13+
$AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('MYSQL_PASSWORD_FILE')));
14+
$AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
15+
$autoconfig_enabled = true;
916
} elseif (getenv('MYSQL_DATABASE') && getenv('MYSQL_USER') && getenv('MYSQL_PASSWORD') && getenv('MYSQL_HOST')) {
1017
$AUTOCONFIG['dbtype'] = 'mysql';
1118
$AUTOCONFIG['dbname'] = getenv('MYSQL_DATABASE');
1219
$AUTOCONFIG['dbuser'] = getenv('MYSQL_USER');
1320
$AUTOCONFIG['dbpass'] = getenv('MYSQL_PASSWORD');
1421
$AUTOCONFIG['dbhost'] = getenv('MYSQL_HOST');
1522
$autoconfig_enabled = true;
23+
} elseif (getenv('POSTGRES_DB_FILE') && getenv('POSTGRES_USER_FILE') && getenv('POSTGRES_PASSWORD_FILE') && getenv('POSTGRES_HOST')) {
24+
$AUTOCONFIG['dbtype'] = 'pgsql';
25+
$AUTOCONFIG['dbname'] = trim(file_get_contents(getenv('POSTGRES_DB_FILE')));
26+
$AUTOCONFIG['dbuser'] = trim(file_get_contents(getenv('POSTGRES_USER_FILE')));
27+
$AUTOCONFIG['dbpass'] = trim(file_get_contents(getenv('POSTGRES_PASSWORD_FILE')));
28+
$AUTOCONFIG['dbhost'] = getenv('POSTGRES_HOST');
29+
$autoconfig_enabled = true;
1630
} elseif (getenv('POSTGRES_DB') && getenv('POSTGRES_USER') && getenv('POSTGRES_PASSWORD') && getenv('POSTGRES_HOST')) {
1731
$AUTOCONFIG['dbtype'] = 'pgsql';
1832
$AUTOCONFIG['dbname'] = getenv('POSTGRES_DB');

0 commit comments

Comments
 (0)