Update to 4.8.1

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Move back compress and AllowNoPassword to default configuration
2026-08-27 02:24:25 -05:00 · 2018-05-24 23:43:52 -04:00 · 2018-05-17 16:09:14 +02:00 · 2018-04-19 10:14:25 -04:00 · 2018-04-18 08:40:37 +02:00 · 2018-04-18 08:22:22 +02:00
2 changed files with 9 additions and 4 deletions
@@ -36,7 +36,7 @@ COPY run.sh /run.sh
 RUN chmod u+rwx /run.sh

 # Calculate download URL
-ENV VERSION 4.8.0
+ENV VERSION 4.8.1
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.gz
 LABEL version=$VERSION

@@ -47,9 +47,14 @@ RUN set -ex; \
    ; \
    \
    export GNUPGHOME="$(mktemp -d)"; \
+    export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \
    curl --output phpMyAdmin.tar.gz --location $URL; \
    curl --output phpMyAdmin.tar.gz.asc --location $URL.asc; \
-    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 3D06A59ECE730EB71B511C17CE752F178259BD92; \
+    gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
+        || gpg --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \
+        || gpg --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \
+        || gpg --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \
+        || gpg --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \
    gpg --batch --verify phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz; \
    rm -rf "$GNUPGHOME"; \
    tar xzf phpMyAdmin.tar.gz; \
@@ -94,8 +94,6 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
      $cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
      $cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings';
      $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-      $cfg['Servers'][$i]['compress'] = false;
-      $cfg['Servers'][$i]['AllowNoPassword'] = true;
    }
    if (isset($_ENV['PMA_CONTROLHOST'])) {
      $cfg['Servers'][$i]['controlhost'] = $_ENV['PMA_CONTROLHOST'];
@@ -109,6 +107,8 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
    if (isset($_ENV['PMA_CONTROLPASS'])) {
      $cfg['Servers'][$i]['controlpass'] = $_ENV['PMA_CONTROLPASS'];
    }
+    $cfg['Servers'][$i]['compress'] = false;
+    $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
 /*
 * Revert back to last configured server to make
Author	SHA1	Message	Date
Isaac Bennetch	e831e55d59	Update to 4.8.1 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2018-05-24 23:43:52 -04:00
Sullivan SENECHALandMichal Čihař	7a5f742d7d	Move back compress and AllowNoPassword to default configuration	2018-05-17 16:09:14 +02:00
Isaac Bennetch	316a237509	Update to 4.8.0.1 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2018-04-19 10:14:25 -04:00
Michal Čihař	44a266c45d	Add missing newline escape Signed-off-by: Michal Čihař <michal@cihar.com>	2018-04-18 08:40:37 +02:00
Michal Čihař	2fe5947116	Use more pgp keyservers to download the key Apparently this is only way to make this reliable. See #149 Signed-off-by: Michal Čihař <michal@cihar.com>	2018-04-18 08:22:22 +02:00
Michal Čihař	92a5a76a26	Switch to gnupg.net keyservers The old one seem not to be accessible sometimes. See #149 Signed-off-by: Michal Čihař <michal@cihar.com>	2018-04-18 08:08:05 +02:00