@@ -7,14 +7,15 @@ ARG VERSION_RANGE
77ARG GIST_REVISION="462a4fde9c82f4e0b028e35c751625d278d8303c"
88ARG GIST_URL="https://gist.githubusercontent.com/williamdes/883f2158f17e9ed5a83d892ada56f5df/raw/${GIST_REVISION}/upgradephpmyadmin.sh"
99
10- RUN curl -# -o ./upgradephpmyadmin.sh "${GIST_URL}" ; \
11- && chmod +x ./upgradephpmyadmin.sh; \
12- && echo "Version-range: ${VERSION_RANGE}" ; \
13- && ./upgradephpmyadmin.sh /var/www/ www-data www-data "${VERSION_RANGE}+snapshot" html; \
14- && export CONFIG_FILE="/var/www/html/libraries/vendor_config.php" ; \
15- && if [ ! -f $CONFIG_FILE ]; then export CONFIG_FILE="/var/www/html/app/vendor_config.php" ; fi; \
10+ RUN set -eux; \
11+ curl -# -o ./upgradephpmyadmin.sh "${GIST_URL}" ; \
12+ chmod +x ./upgradephpmyadmin.sh; \
13+ echo "Version-range: ${VERSION_RANGE}" ; \
14+ ./upgradephpmyadmin.sh /var/www/ www-data www-data "${VERSION_RANGE}+snapshot" html; \
15+ export CONFIG_FILE="/var/www/html/libraries/vendor_config.php" ; \
16+ if [ ! -f $CONFIG_FILE ]; then export CONFIG_FILE="/var/www/html/app/vendor_config.php" ; fi; \
1617 # Source: https://github.com/phpmyadmin/docker/blob/905cae841eff6eb0d24755435f44e26af0488093/apache/Dockerfile#L112-L115
17- && grep -q -F "'configFile' => ROOT_PATH . 'config.inc.php'," $CONFIG_FILE; \
18- && sed -i "s@'configFile' => .*@'configFile' => '/etc/phpmyadmin/config.inc.php',@" $CONFIG_FILE; \
19- && grep -q -F "'configFile' => '/etc/phpmyadmin/config.inc.php'," $CONFIG_FILE; \
20- && php -l $CONFIG_FILE;
18+ grep -q -F "'configFile' => ROOT_PATH . 'config.inc.php'," $CONFIG_FILE; \
19+ sed -i "s@'configFile' => .*@'configFile' => '/etc/phpmyadmin/config.inc.php',@" $CONFIG_FILE; \
20+ grep -q -F "'configFile' => '/etc/phpmyadmin/config.inc.php'," $CONFIG_FILE; \
21+ php -l $CONFIG_FILE;
0 commit comments