Merge branch 'master' into edge-4.7

Update to 4.7.3
Signed-off-by: Michal Čihař <michal@cihar.com>
2026-08-27 18:14:26 -05:00 · 2017-08-23 16:20:35 +02:00 · 2017-07-20 23:09:24 +02:00 · 2017-06-29 15:35:37 -04:00 · 2017-06-19 12:42:05 +02:00 · 2017-06-07 15:25:14 +02:00
2 changed files with 4 additions and 7 deletions
@@ -1,7 +1,7 @@
 FROM alpine:3.5

 # Install dependencies
-RUN apk add --no-cache php7-session php7-mysqli php7-mbstring php7-xml php7-gd php7-zlib php7-bz2 php7-zip php7-openssl php7-curl php7-opcache php7-json php7-ctype nginx php7-fpm supervisor
+RUN apk add --no-cache php7-session php7-mysqli php7-mbstring php7-xml php7-gd php7-zlib php7-bz2 php7-zip php7-openssl php7-curl php7-opcache php7-json nginx php7-fpm supervisor

 # Include keyring to verify download
 COPY phpmyadmin.keyring /
@@ -14,8 +14,8 @@ COPY run.sh /run.sh
 RUN chmod u+rwx /run.sh

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

 # Download tarball, verify it using gpg and extract
@@ -24,12 +24,9 @@ RUN set -x \
    && export GNUPGHOME \
    && apk add --no-cache curl gnupg \
    && curl --output phpMyAdmin.tar.gz --location $URL \
-    && curl --output phpMyAdmin.tar.gz.asc --location $URL.asc \
-    && gpgv --keyring /phpmyadmin.keyring phpMyAdmin.tar.gz.asc phpMyAdmin.tar.gz \
    && apk del --no-cache curl gnupg \
    && rm -rf "$GNUPGHOME" \
    && tar xzf phpMyAdmin.tar.gz \
-    && rm -f phpMyAdmin.tar.gz phpMyAdmin.tar.gz.asc \
    && mv phpMyAdmin-$VERSION-all-languages /www \
    && rm -rf /www/setup/ /www/examples/ /www/test/ /www/po/ /www/composer.json /www/RELEASE-DATE-$VERSION \
    && sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /www/libraries/vendor_config.php \
@@ -56,7 +56,7 @@ docker run --name myadmin -d -e PMA_HOST=dbhost -p 8080:80 phpmyadmin/phpmyadmin
 You can use arbitrary servers by adding ENV variable `PMA_ARBITRARY=1` to the startup command:

 ```
-docker run --name myadmin -d --link mysql_db_server:db -p 8080:80 -e PMA_ARBITRARY=1 phpmyadmin/phpmyadmin
+docker run --name myadmin -d -e PMA_ARBITRARY=1 -p 8080:80 phpmyadmin/phpmyadmin
 ```

 ## Usage with docker-compose and arbitrary server
Author	SHA1	Message	Date
Michal Čihař	797b16cddc	Merge branch 'master' into edge-4.7	2017-08-23 16:20:35 +02:00
Michal Čihař	15e82b23d2	Update to 4.7.3 Signed-off-by: Michal Čihař <michal@cihar.com>	2017-07-20 23:09:24 +02:00
Isaac Bennetch	ff2edd1f87	Update Docker image to phpMyAdmin 4.7.2 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2017-06-29 15:35:37 -04:00
Michal Čihař	275b59e3dd	Remove no longer needed ctype dependency Fixes #115 Signed-off-by: Michal Čihař <michal@cihar.com>	2017-06-19 12:42:05 +02:00
Michal ČihařandGitHub	a18b6e3842	Merge pull request #128 from tomasliubinas/patch-1 Remove link to db container	2017-06-07 15:25:14 +02:00
Tomas LiubinasandGitHub	524e669ce9	Remove link to another container You don't need linking to db container in case of arbitrary server	2017-06-07 16:09:49 +03:00
Michal Čihař	a924c9da70	Remove pgp verification for snapshots They do not come with signatures Signed-off-by: Michal Čihař <michal@cihar.com>	2017-05-05 16:27:07 +02:00
Michal Čihař	174f145d54	Build 4.7 snapshot image Signed-off-by: Michal Čihař <michal@cihar.com>	2017-05-05 16:20:12 +02:00