diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 3981717a..e550c79f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -29,36 +29,21 @@ RUN set -ex; \ apk del .build-deps # Calculate download URL -ENV VERSION 4.9.0.1 -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV VERSION 4.9+snapshot +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION -# Download tarball, verify it using gpg and extract +# Download tarball and extract RUN set -ex; \ - apk add --no-cache --virtual .fetch-deps \ - gnupg \ - ; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \ curl --output phpMyAdmin.tar.xz --location $URL; \ - curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ - gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ tar -xf phpMyAdmin.tar.xz -C /usr/src; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ + rm -r phpMyAdmin.tar.xz; \ mv /usr/src/phpMyAdmin-$VERSION-all-languages /usr/src/phpmyadmin; \ rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-$VERSION; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \ # Add directory for sessions to allow session persistence mkdir /sessions; \ - mkdir -p /var/nginx/client_body_temp; \ - apk del .fetch-deps + mkdir -p /var/nginx/client_body_temp # Copy configuration COPY config.inc.php /etc/phpmyadmin/config.inc.php diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 6bf93d6c..0cb6ede0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -32,41 +32,21 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Calculate download URL -ENV VERSION 4.9.0.1 -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV VERSION 4.9+snapshot +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION -# Download tarball, verify it using gpg and extract +# Download tarball and extract RUN set -ex; \ - fetchDeps=" \ - gnupg \ - dirmngr \ - "; \ - apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \ curl --output phpMyAdmin.tar.xz --location $URL; \ - curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ - gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ tar -xf phpMyAdmin.tar.xz -C /usr/src; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ + rm -r phpMyAdmin.tar.xz; \ mv /usr/src/phpMyAdmin-$VERSION-all-languages /usr/src/phpmyadmin; \ rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-$VERSION; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \ # Add directory for sessions to allow session persistence mkdir /sessions; \ - mkdir -p /var/nginx/client_body_temp; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + mkdir -p /var/nginx/client_body_temp # Copy configuration COPY config.inc.php /etc/phpmyadmin/config.inc.php diff --git a/apache/Dockerfile b/apache/Dockerfile index 8419655b..092ac67f 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -32,41 +32,21 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Calculate download URL -ENV VERSION 4.9.0.1 -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV VERSION 4.9+snapshot +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION -# Download tarball, verify it using gpg and extract +# Download tarball and extract RUN set -ex; \ - fetchDeps=" \ - gnupg \ - dirmngr \ - "; \ - apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \ curl --output phpMyAdmin.tar.xz --location $URL; \ - curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ - gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ tar -xf phpMyAdmin.tar.xz -C /usr/src; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ + rm -r phpMyAdmin.tar.xz; \ mv /usr/src/phpMyAdmin-$VERSION-all-languages /usr/src/phpmyadmin; \ rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-$VERSION; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \ # Add directory for sessions to allow session persistence mkdir /sessions; \ - mkdir -p /var/nginx/client_body_temp; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + mkdir -p /var/nginx/client_body_temp # Copy configuration COPY config.inc.php /etc/phpmyadmin/config.inc.php diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index e30a3702..1f047a8d 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -29,36 +29,21 @@ RUN set -ex; \ apk del .build-deps # Calculate download URL -ENV VERSION 4.9.0.1 -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV VERSION 4.9+snapshot +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION -# Download tarball, verify it using gpg and extract +# Download tarball and extract RUN set -ex; \ - apk add --no-cache --virtual .fetch-deps \ - gnupg \ - ; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \ curl --output phpMyAdmin.tar.xz --location $URL; \ - curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ - gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ tar -xf phpMyAdmin.tar.xz -C /usr/src; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ + rm -r phpMyAdmin.tar.xz; \ mv /usr/src/phpMyAdmin-$VERSION-all-languages /usr/src/phpmyadmin; \ rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-$VERSION; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \ # Add directory for sessions to allow session persistence mkdir /sessions; \ - mkdir -p /var/nginx/client_body_temp; \ - apk del .fetch-deps + mkdir -p /var/nginx/client_body_temp # Copy configuration COPY config.inc.php /etc/phpmyadmin/config.inc.php diff --git a/fpm/Dockerfile b/fpm/Dockerfile index e25e40db..47f4f721 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -32,41 +32,21 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Calculate download URL -ENV VERSION 4.9.0.1 -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV VERSION 4.9+snapshot +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION -# Download tarball, verify it using gpg and extract +# Download tarball and extract RUN set -ex; \ - fetchDeps=" \ - gnupg \ - dirmngr \ - "; \ - apt-get update; \ - apt-get install -y --no-install-recommends $fetchDeps; \ - \ - export GNUPGHOME="$(mktemp -d)"; \ - export GPGKEY="3D06A59ECE730EB71B511C17CE752F178259BD92"; \ curl --output phpMyAdmin.tar.xz --location $URL; \ - curl --output phpMyAdmin.tar.xz.asc --location $URL.asc; \ - gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver ipv4.pool.sks-keyservers.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keys.gnupg.net --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver pgp.mit.edu --recv-keys "$GPGKEY" \ - || gpg --batch --keyserver keyserver.pgp.com --recv-keys "$GPGKEY"; \ - gpg --batch --verify phpMyAdmin.tar.xz.asc phpMyAdmin.tar.xz; \ tar -xf phpMyAdmin.tar.xz -C /usr/src; \ - gpgconf --kill all; \ - rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \ + rm -r phpMyAdmin.tar.xz; \ mv /usr/src/phpMyAdmin-$VERSION-all-languages /usr/src/phpmyadmin; \ rm -rf /usr/src/phpmyadmin/setup/ /usr/src/phpmyadmin/examples/ /usr/src/phpmyadmin/test/ /usr/src/phpmyadmin/po/ /usr/src/phpmyadmin/composer.json /usr/src/phpmyadmin/RELEASE-DATE-$VERSION; \ sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /usr/src/phpmyadmin/libraries/vendor_config.php; \ # Add directory for sessions to allow session persistence mkdir /sessions; \ - mkdir -p /var/nginx/client_body_temp; \ - \ - apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \ - rm -rf /var/lib/apt/lists/* + mkdir -p /var/nginx/client_body_temp # Copy configuration COPY config.inc.php /etc/phpmyadmin/config.inc.php