From db5c629d4a943c101318317a4cadcb590a8d021f Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 5 Jun 2019 22:24:05 -0400 Subject: [PATCH 1/3] Set up edge-4.9 Signed-off-by: Isaac Bennetch --- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- apache/Dockerfile | 2 +- fpm-alpine/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 3981717a..181a314e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -29,7 +29,7 @@ RUN set -ex; \ apk del .build-deps # Calculate download URL -ENV VERSION 4.9.0.1 +ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 6bf93d6c..c45c8da3 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -32,7 +32,7 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Calculate download URL -ENV VERSION 4.9.0.1 +ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION diff --git a/apache/Dockerfile b/apache/Dockerfile index 8419655b..1c01ddbb 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -32,7 +32,7 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Calculate download URL -ENV VERSION 4.9.0.1 +ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index e30a3702..1690c46d 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -29,7 +29,7 @@ RUN set -ex; \ apk del .build-deps # Calculate download URL -ENV VERSION 4.9.0.1 +ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION diff --git a/fpm/Dockerfile b/fpm/Dockerfile index e25e40db..ff6d89d4 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -32,7 +32,7 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/* # Calculate download URL -ENV VERSION 4.9.0.1 +ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION From 21be77a8e8d4e9118d8a32de66bdb4e042d02726 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Fri, 7 Jun 2019 15:04:54 -0400 Subject: [PATCH 2/3] Remove GPG verification of downloads, since we don't sign snapshot builds. See also: #131 Fixes: #228 Signed-off-by: Isaac Bennetch --- Dockerfile-alpine.template | 21 +++------------------ Dockerfile-debian.template | 26 +++----------------------- apache/Dockerfile | 26 +++----------------------- fpm-alpine/Dockerfile | 21 +++------------------ fpm/Dockerfile | 26 +++----------------------- 5 files changed, 15 insertions(+), 105 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 181a314e..0fc39a55 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -33,32 +33,17 @@ ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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 c45c8da3..a3fb0173 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -36,37 +36,17 @@ ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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 1c01ddbb..303fa7ef 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -36,37 +36,17 @@ ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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 1690c46d..a96dbc59 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -33,32 +33,17 @@ ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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 ff6d89d4..72d8a513 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -36,37 +36,17 @@ ENV VERSION 4.9+snapshot ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/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 From 8803357e6af70a20c3aafff3f89a7db1064d542c Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Fri, 7 Jun 2019 15:13:28 -0400 Subject: [PATCH 3/3] Configure to use snapshot builds for 4.9 series Signed-off-by: Isaac Bennetch --- Dockerfile-alpine.template | 2 +- Dockerfile-debian.template | 2 +- apache/Dockerfile | 2 +- fpm-alpine/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 0fc39a55..e550c79f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -30,7 +30,7 @@ RUN set -ex; \ # Calculate download URL ENV VERSION 4.9+snapshot -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION # Download tarball and extract diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index a3fb0173..0cb6ede0 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -33,7 +33,7 @@ RUN set -ex; \ # Calculate download URL ENV VERSION 4.9+snapshot -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION # Download tarball and extract diff --git a/apache/Dockerfile b/apache/Dockerfile index 303fa7ef..092ac67f 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -33,7 +33,7 @@ RUN set -ex; \ # Calculate download URL ENV VERSION 4.9+snapshot -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION # Download tarball and extract diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index a96dbc59..1f047a8d 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -30,7 +30,7 @@ RUN set -ex; \ # Calculate download URL ENV VERSION 4.9+snapshot -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION # Download tarball and extract diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 72d8a513..47f4f721 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -33,7 +33,7 @@ RUN set -ex; \ # Calculate download URL ENV VERSION 4.9+snapshot -ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz +ENV URL https://files.phpmyadmin.net/snapshots/phpMyAdmin-${VERSION}-all-languages.tar.xz LABEL version=$VERSION # Download tarball and extract