Skip to content

Commit affe5b3

Browse files
authored
Merge pull request #7 from linuxserver/fix-config
2 parents 317507f + 6d1cf7e commit affe5b3

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN \
5656
tar xf \
5757
/tmp/phpmyadmin.tar.xz -C \
5858
/app/phpmyadmin/ --strip-components=1 && \
59-
sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/config/phpmyadmin/');@" "/app/phpmyadmin/libraries/vendor_config.php" && \
59+
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/phpmyadmin/libraries/vendor_config.php" && \
6060
sed -i 's@;clear_env = no@clear_env = no@' "/etc/php7/php-fpm.d/www.conf" && \
6161
rm -rf \
6262
/tmp/*

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN \
5656
tar xf \
5757
/tmp/phpmyadmin.tar.xz -C \
5858
/app/phpmyadmin/ --strip-components=1 && \
59-
sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/config/phpmyadmin/');@" "/app/phpmyadmin/libraries/vendor_config.php" && \
59+
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/phpmyadmin/libraries/vendor_config.php" && \
6060
sed -i 's@;clear_env = no@clear_env = no@' "/etc/php7/php-fpm.d/www.conf" && \
6161
rm -rf \
6262
/tmp/*

Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN \
5656
tar xf \
5757
/tmp/phpmyadmin.tar.xz -C \
5858
/app/phpmyadmin/ --strip-components=1 && \
59-
sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/config/phpmyadmin/');@" "/app/phpmyadmin/libraries/vendor_config.php" && \
59+
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/phpmyadmin/libraries/vendor_config.php" && \
6060
sed -i 's@;clear_env = no@clear_env = no@' "/etc/php7/php-fpm.d/www.conf" && \
6161
rm -rf \
6262
/tmp/*

0 commit comments

Comments
 (0)