Configure to use snapshot builds for 4.9 series

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Remove GPG verification of downloads, since we don't sign snapshot
2026-08-24 10:13:22 -05:00 · 2019-06-08 13:56:12 -04:00 · 2019-06-08 13:54:17 -04:00 · 2019-06-05 22:24:05 -04:00
14 changed files with 229 additions and 517 deletions
@@ -2,13 +2,13 @@ services:
  - docker

 language: python
-python: 2.7
-dist: bionic
+python:
+  - "2.7"

-stages:
-  - name: "Build images"
-  - name: "Test docker-compose"
-  - name: "Run tests in testing container"
+env:
+  matrix:
+    - DB=mysql:latest
+    - DB=mariadb:latest

 before_install:
  - export TESTSUITE_PASSWORD=`openssl rand -base64 30`
@@ -17,74 +17,26 @@ before_install:
 install:
  - pip install mechanize html5lib

-_helpers:
- &test-docker-compose
-  stage: "Test docker-compose"
-  script:
-    - docker-compose -f docker-compose.testing.yml up -d db_server
-    - docker-compose -f docker-compose.testing.yml up -d
-    - docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
-    - docker-compose stop
- &test-apache-image
-  stage: "Run tests in testing container"
-  script:
-    # Build image
-    - docker build -t phpmyadmin/phpmyadmin apache
-    # Test for single database
-    - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
-    - ./testing/test-docker.sh testadmin 9090
-    # Test for single database using env
-    - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin/phpmyadmin
-    - ./testing/test-docker.sh envadmin 6060
-    # Test for arbitrary database
-    - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
-    - ./testing/test-docker.sh arbitraryadmin 7070 db3
-    # Test for arbitrary database with user config
-    - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./testing/config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin/phpmyadmin
-    - ./testing/test-docker.sh userconfigadmin 7080 db3
- &test-docker-compose-db
-  stage: "Test docker-compose"
-  script:
-    - docker-compose -f docker-compose.yml -f docker-compose.db.yml up -d
-    - ./testing/test-docker.sh phpmyadmin 8080 db_server
-    - docker-compose stop
- &build-image
-  stage: "Build images"
-  before_install: skip
-  install: skip
-
-jobs:
-  include:
-    - <<: *test-docker-compose
-      name: "Run and stop container using testing docker-compose file for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-docker-compose
-      name: "Run and stop container using testing docker-compose file for MySQL"
-      env: DB=mysql:latest
-    - <<: *test-docker-compose-db
-      name: "Run and stop container using db docker-compose file for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-docker-compose-db
-      name: "Run and stop container using db docker-compose file for MySQL"
-      env: DB=mysql:latest
-    - <<: *build-image
-      name: "Apache amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin/phpmyadmin apache
-    - <<: *build-image
-      name: "fpm amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin/phpmyadmin fpm
-    - <<: *build-image
-      name: "fpm-alpine amd64"
-      arch: amd64
-      script:
-      - docker build -t phpmyadmin/phpmyadmin fpm-alpine
-    - <<: *test-apache-image
-      name: "Run testing for MariaDB"
-      env: DB=mariadb:latest
-    - <<: *test-apache-image
-      name: "Run testing for MySQL"
-      env: DB=mysql:latest
+script:
+  # Build image
+  - docker build -t phpmyadmin/phpmyadmin apache
+  # Test for single database
+  - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh testadmin 9090
+  # Test for single database using env
+  - docker run --name envadmin -d --link db_server:db2 -e PMA_HOST=db2 -p 6060:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh envadmin 6060
+  # Test for arbitrary database
+  - docker run --name arbitraryadmin -d --link db_server:db3 -e PMA_ARBITRARY=1 -p 7070:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh arbitraryadmin 7070 db3
+  # Test for arbitrary database with user config
+  - docker run --name userconfigadmin -d --link db_server:db3 -v `readlink -f ./testing/config.test.inc.php`:/etc/phpmyadmin/config.user.inc.php -p 7080:80 phpmyadmin/phpmyadmin
+  - ./testing/test-docker.sh userconfigadmin 7080 db3
+  # Test docker-compose
+  - docker-compose -f docker-compose.yml -f docker-compose.db.yml up -d
+  - ./testing/test-docker.sh phpmyadmin 8080 db_server
+  - docker-compose stop
+  # Run tests in testing container
+  - docker-compose -f docker-compose.testing.yml up -d db_server
+  - docker-compose -f docker-compose.testing.yml up -d
+  - docker-compose exec phpmyadmin /test-docker.sh phpmyadmin_testing 80 phpmyadmin_testing_db
@@ -2,7 +2,7 @@ FROM php:7.2-%%VARIANT%%

 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
-    bash
+	bash

 # Install dependencies
 RUN set -ex; \
@@ -28,62 +28,26 @@ RUN set -ex; \
    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
    apk del .build-deps

-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
-
 # Calculate download URL
-ENV VERSION %%VERSION%%
-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
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -2,96 +2,55 @@ FROM php:7.2-%%VARIANT%%

 # Install dependencies
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libbz2-dev \
+		libfreetype6-dev \
+		libjpeg-dev \
+		libpng-dev \
+		libwebp-dev \
+		libxpm-dev \
+	; \
+	\
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
+	docker-php-ext-install bz2 gd mysqli opcache zip; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*

 # Calculate download URL
-ENV VERSION %%VERSION%%
-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
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -1,6 +1,6 @@
 DOCKER_REPO = phpmyadmin/phpmyadmin

-.PHONY: all build run logs clean stop rm prune
+.PHONY: all build build_nc run logs clean stop rm prune

 all: build run logs

@@ -28,21 +28,8 @@ You can use following tags on Docker hub:

 * `latest` - latest stable release
 * `4.8` - latest stable release for the 4.8 version
-* `4.8.5` - specific patch release for the 4.8 version
-
-For each tag the following variants are provided:
-
-### apache
-
-This starts an Apache webserver with PHP, so you can use phpMyAdmin out of the box.
-
-### fpm-alpine
-
-This image has a very small footprint. It is based on Alpine Linux and starts only a PHP FPM process. Use this variant if you already have a seperate webserver. If you need more tools, that are not available on Alpine Linux, use the fpm image instead.
-
-### fpm
-
-This image starts only a PHP FPM container. Use this variant if you already have a seperate webserver.
+* `edge` - bleeding edge docker image (contains stable phpMyAdmin, but the Docker image changes might not yet be fully tested)
+* `edge-4.8` - bleeding edge docker image + latest snapshots from 4.8 branch (currently master)

 ## Usage with linked server

@@ -125,11 +112,6 @@ Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma
 * ``PMA_USER`` and ``PMA_PASSWORD`` - define username to use for config authentication method
 * ``PMA_ABSOLUTE_URI`` - define user-facing URI

-For usage with Docker secrets, appending ``_FILE`` to any environment variable is allowed:
-```
-docker run --name myadmin -d -e PMA_PASSWORD_FILE=/run/secrets/db_password.txt -p 8080:80 phpmyadmin/phpmyadmin
-```
-
 For more detailed documentation see https://docs.phpmyadmin.net/en/latest/setup.html#installing-using-docker

 [hub]: https://hub.docker.com/r/phpmyadmin/phpmyadmin/
@@ -2,96 +2,55 @@ FROM php:7.2-apache

 # Install dependencies
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libbz2-dev \
+		libfreetype6-dev \
+		libjpeg-dev \
+		libpng-dev \
+		libwebp-dev \
+		libxpm-dev \
+	; \
+	\
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
+	docker-php-ext-install bz2 gd mysqli opcache zip; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*

 # Calculate download URL
-ENV VERSION 4.9.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
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -0,0 +1,20 @@
+[PHP]
+allow_url_fopen = Off
+max_execution_time = 600
+memory_limit = 512M
+open_basedir = /var/www/html:/tmp/:/etc/phpmyadmin/
+post_max_size = 512M
+upload_max_filesize = 512M
+
+[Session]
+session.cookie_httponly = 1
+session.hash_function = 1
+session.save_path = "/sessions"
+session.use_strict_mode = 1
+
+[opcache]
+opcache.fast_shutdown = 1
+opcache.restrict_api = /disabled/
+opcache.save_comments = 0
+opcache.use_cwd = 0
+opcache.validate_timestamps = 0
@@ -2,7 +2,7 @@ FROM php:7.2-fpm-alpine

 # docker-entrypoint.sh dependencies
 RUN apk add --no-cache \
-    bash
+	bash

 # Install dependencies
 RUN set -ex; \
@@ -28,62 +28,26 @@ RUN set -ex; \
    apk add --virtual .phpmyadmin-phpexts-rundeps $runDeps; \
    apk del .build-deps

-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
-
 # Calculate download URL
-ENV VERSION 4.9.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
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -0,0 +1,20 @@
+[PHP]
+allow_url_fopen = Off
+max_execution_time = 600
+memory_limit = 512M
+open_basedir = /var/www/html:/tmp/:/etc/phpmyadmin/
+post_max_size = 512M
+upload_max_filesize = 512M
+
+[Session]
+session.cookie_httponly = 1
+session.hash_function = 1
+session.save_path = "/sessions"
+session.use_strict_mode = 1
+
+[opcache]
+opcache.fast_shutdown = 1
+opcache.restrict_api = /disabled/
+opcache.save_comments = 0
+opcache.use_cwd = 0
+opcache.validate_timestamps = 0
@@ -2,96 +2,55 @@ FROM php:7.2-fpm

 # Install dependencies
 RUN set -ex; \
-    \
-    savedAptMark="$(apt-mark showmanual)"; \
-    \
-    apt-get update; \
-    apt-get install -y --no-install-recommends \
-        libbz2-dev \
-        libfreetype6-dev \
-        libjpeg-dev \
-        libpng-dev \
-        libwebp-dev \
-        libxpm-dev \
-    ; \
-    \
-    docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
-    docker-php-ext-install bz2 gd mysqli opcache zip; \
-    \
-    apt-mark auto '.*' > /dev/null; \
-    apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-        | awk '/=>/ { print $3 }' \
-        | sort -u \
-        | xargs -r dpkg-query -S \
-        | cut -d: -f1 \
-        | sort -u \
-        | xargs -rt apt-mark manual; \
-    \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
-
-# set recommended PHP.ini settings
-# see https://secure.php.net/manual/en/opcache.installation.php
-RUN { \
-        echo 'opcache.memory_consumption=128'; \
-        echo 'opcache.interned_strings_buffer=8'; \
-        echo 'opcache.max_accelerated_files=4000'; \
-        echo 'opcache.revalidate_freq=2'; \
-        echo 'opcache.fast_shutdown=1'; \
-        echo 'opcache.enable_cli=1'; \
-    } > /usr/local/etc/php/conf.d/opcache-recommended.ini; \
-    \
-    { \
-        echo 'session.cookie_httponly = 1'; \
-        echo 'session.use_strict_mode = 1'; \
-    } > /usr/local/etc/php/conf.d/session-strict.ini; \
-    \
-    { \
-        echo 'allow_url_fopen = Off'; \
-        echo 'max_execution_time = 600'; \
-        echo 'memory_limit = 512M'; \
-    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	\
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		libbz2-dev \
+		libfreetype6-dev \
+		libjpeg-dev \
+		libpng-dev \
+		libwebp-dev \
+		libxpm-dev \
+	; \
+	\
+	docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \
+	docker-php-ext-install bz2 gd mysqli opcache zip; \
+	\
+	apt-mark auto '.*' > /dev/null; \
+	apt-mark manual $savedAptMark; \
+	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+		| awk '/=>/ { print $3 }' \
+		| sort -u \
+		| xargs -r dpkg-query -S \
+		| cut -d: -f1 \
+		| sort -u \
+		| xargs -rt apt-mark manual; \
+	\
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	rm -rf /var/lib/apt/lists/*

 # Calculate download URL
-ENV VERSION 4.9.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
+COPY php.ini /usr/local/etc/php/conf.d/php-phpmyadmin.ini

 # Copy main script
 COPY docker-entrypoint.sh /docker-entrypoint.sh
@@ -0,0 +1,20 @@
+[PHP]
+allow_url_fopen = Off
+max_execution_time = 600
+memory_limit = 512M
+open_basedir = /var/www/html:/tmp/:/etc/phpmyadmin/
+post_max_size = 512M
+upload_max_filesize = 512M
+
+[Session]
+session.cookie_httponly = 1
+session.hash_function = 1
+session.save_path = "/sessions"
+session.use_strict_mode = 1
+
+[opcache]
+opcache.fast_shutdown = 1
+opcache.restrict_api = /disabled/
+opcache.save_comments = 0
+opcache.use_cwd = 0
+opcache.validate_timestamps = 0
@@ -1,97 +0,0 @@
-#!/bin/bash
-set -e
-
-self="$(basename "$BASH_SOURCE")"
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-# Get the most recent commit which modified any of "$@".
-fileCommit() {
-	git log -1 --format='format:%H' HEAD -- "$@"
-}
-
-# Get the most recent commit which modified "$1/Dockerfile" or any file that
-# the Dockerfile copies into the rootfs (with COPY).
-dockerfileCommit() {
-	local dir="$1"; shift
-	(
-		cd "$dir";
-		fileCommit Dockerfile \
-			$(git show HEAD:./Dockerfile | awk '
-				toupper($1) == "COPY" {
-					for (i = 2; i < NF; i++)
-							print $i;
-				}
-			')
-	)
-}
-
-# depends on docker library
-#getArches() {
-#	local repo="$1"; shift
-#	local officialImagesUrl='https://github.com/docker-library/official-images/raw/master/library/'
-#
-#	eval "declare -g -A parentRepoToArches=( $(
-#		find -name 'Dockerfile' -exec awk '
-#				toupper($1) == "FROM" && $2 !~ /^('"$repo"'|scratch|microsoft\/[^:]+)(:|$)/ {
-#					print "'"$officialImagesUrl"'" $2
-#				}
-#			' '{}' + \
-#			| sort -u \
-#			| xargs bashbrew cat --format '[{{ .RepoName }}:{{ .TagName }}]="{{ join " " .TagEntry.Architectures }}"'
-#	) )"
-#}
-#getArches 'phpmyadmin'
-
-# Header.
-cat <<-EOH
-# This file is generated via https://github.com/phpmyadmin/docker/blob/$(fileCommit "$self")/$self
-Maintainers: Isaac Bennetch <bennetch@gmail.com>
-             Michal Čihař <michal@cihar.com>
-GitRepo: https://github.com/phpmyadmin/docker.git
-EOH
-
-# prints "$2$1$3$1...$N"
-join() {
-	local sep="$1"; shift
-	local out; printf -v out "${sep//%/%%}%s" "$@"
-	echo "${out#$sep}"
-}
-
-latest="$(
-	git ls-remote --tags https://github.com/phpmyadmin/phpmyadmin.git \
-		| cut -d/ -f3 \
-		| grep -vE -- '-rc|-b' \
-		| sort -V \
-		| tail -1
-)"
-
-for variant in apache fpm fpm-alpine; do
-	commit="$(dockerfileCommit "$variant")"
-	fullversion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "VERSION" { print $3; exit }')"
-
-	versionAliases=( "$fullversion" "${fullversion%.*}" "${fullversion%.*.*}" )
-	if [ "$fullversion" = "$latest" ]; then
-		versionAliases+=( "latest" )
-	fi
-
-	variantAliases=( "${versionAliases[@]/%/-$variant}" )
-	variantAliases=( "${variantAliases[@]//latest-}" )
-
-	if [ "$variant" = "apache" ]; then
-		variantAliases+=( "${versionAliases[@]}" )
-	fi
-
-	variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$variant/Dockerfile")"
-
-	# depends on docker library
-	#variantArches="${parentRepoToArches[$variantParent]}"
-	variantArches="amd64 arm32v7 arm64v8 i386 ppc64le"
-
-	cat <<-EOE
-
-		Tags: $(join ', ' "${variantAliases[@]}")
-		Architectures: $(join ', ' $variantArches)
-		GitCommit: $commit
-		Directory: $variant
-	EOE
-done
@@ -0,0 +1,20 @@
+[PHP]
+allow_url_fopen = Off
+max_execution_time = 600
+memory_limit = 512M
+open_basedir = /var/www/html:/tmp/:/etc/phpmyadmin/
+post_max_size = 512M
+upload_max_filesize = 512M
+
+[Session]
+session.cookie_httponly = 1
+session.hash_function = 1
+session.save_path = "/sessions"
+session.use_strict_mode = 1
+
+[opcache]
+opcache.fast_shutdown = 1
+opcache.restrict_api = /disabled/
+opcache.save_comments = 0
+opcache.use_cwd = 0
+opcache.validate_timestamps = 0
@@ -1,14 +1,6 @@
 #!/bin/bash
 set -e

-# Check for dependencies
-command -v curl >/dev/null 2>&1 || { echo >&2 "'curl' is required but not found. Aborting."; exit 1; }
-command -v jq >/dev/null 2>&1 || { echo >&2 "'jq' is required but not found. Aborting."; exit 1; }
-if [ -z "${BASH_VERSINFO}" ] || [ -z "${BASH_VERSINFO[0]}" ] || [ ${BASH_VERSINFO[0]} -lt 4 ]; then
-  echo "BASH version 4.0 or greater is required. Aborting."
-  exit 1
-fi
-
 declare -A cmd=(
 	[apache]='apache2-foreground'
 	[fpm]='php-fpm'
@@ -21,15 +13,13 @@ declare -A base=(
 	[fpm-alpine]='alpine'
 )

-latest="$(curl -fsSL 'https://www.phpmyadmin.net/home_page/version.json' | jq -r '.version')"
-
 for variant in apache fpm fpm-alpine; do
 	template="Dockerfile-${base[$variant]}.template"
 	cp $template "$variant/Dockerfile"
 	cp config.inc.php "$variant/config.inc.php"
 	cp docker-entrypoint.sh "$variant/docker-entrypoint.sh"
+	cp php.ini "$variant/php.ini"
 	sed -ri -e '
-		s/%%VERSION%%/'"$latest"'/;
 		s/%%VARIANT%%/'"$variant"'/;
 		s/%%CMD%%/'"${cmd[$variant]}"'/;
 	' "$variant/Dockerfile"
Author	SHA1	Message	Date
Isaac Bennetch	8803357e6a	Configure to use snapshot builds for 4.9 series Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-06-08 13:56:12 -04:00
Isaac Bennetch	21be77a8e8	Remove GPG verification of downloads, since we don't sign snapshot builds. See also: #131 Fixes: #228 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-06-08 13:54:17 -04:00
Isaac Bennetch	db5c629d4a	Set up edge-4.9 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-06-05 22:24:05 -04:00