Remove mcrypt from dependencies, it is not needed with openssl

Signed-off-by: Michal Čihař <michal@cihar.com>
Revert "Switch to PHP 7"
2026-08-27 18:14:26 -05:00 · 2016-06-14 15:45:56 +02:00 · 2016-06-14 15:45:15 +02:00 · 2016-06-14 15:41:18 +02:00 · 2016-06-14 15:39:32 +02:00 · 2016-06-14 09:34:55 -04:00
4 changed files with 4 additions and 15 deletions
@@ -1,7 +1,6 @@
-# Switch back to stable once 3.4 is out
-FROM alpine:edge
+FROM alpine:latest

-RUN apk add --no-cache php5-cli php5-mysqli php5-ctype php5-xml php5-gd php5-zlib php5-openssl php5-curl php5-opcache php5-json php5-mcrypt curl
+RUN apk add --no-cache php5-cli php5-mysqli php5-ctype php5-xml php5-gd php5-zlib php5-bz2 php5-zip php5-openssl php5-curl php5-opcache php5-json curl

 RUN curl --location https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-all-languages.tar.gz | tar xzf - \
 && mv phpMyAdmin* /www \
@@ -48,9 +48,6 @@ Using the docker-compose.yml from https://github.com/phpmyadmin/docker
 docker-compose up -d
 ```

-## Usage behind reverse proxys
-Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma.example.net/``) where the reverse proxy makes phpMyAdmin available.
-
 ## Environment variables summary

 * ``PMA_ARBITRARY`` - when set to 1 connection to the arbitrary server will be allowed
@@ -58,7 +55,6 @@ Set the variable ``PMA_ABSOLUTE_URI`` to the fully-qualified path (``https://pma
 * ``PMA_PORT`` - define port of the MySQL server
 * ``PMA_HOSTS`` - define comma separated list of address/host names of the MySQL servers
 * ``PMA_USER`` and ``PMA_PASSWORD`` - define username to use for config authentication method
-* ``PMA_ABSOLUTE_URI`` - define user-facing URI
 * ``PHP_UPLOAD_MAX_FILESIZE`` - define upload_max_filesize and post_max_size PHP settings
 * ``PHP_MAX_INPUT_VARS`` - define max_input_vars PHP setting 

@@ -10,7 +10,6 @@ $vars = array(
    'PMA_PORT',
    'PMA_USER',
    'PMA_PASSWORD',
-    'PMA_ABSOLUTE_URI'
 );
 foreach ($vars as $var) {
    if (!isset($_ENV[$var]) && getenv($var)) {
@@ -23,11 +22,6 @@ if (isset($_ENV['PMA_ARBITRARY']) && $_ENV['PMA_ARBITRARY'] === '1') {
    $cfg['AllowArbitraryServer'] = true;
 }

-/* Play nice behind reverse proxys */
-if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
-    $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
-}
-
 /* Figure out hosts */

 /* Fallback to default linked */
@@ -46,7 +40,7 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
    if (isset($_ENV['PMA_PORT'])) {
        $cfg['Servers'][$i]['port'] = $_ENV['PMA_PORT'];
    }
-    if (isset($_ENV['PMA_USER'])) {                                
+    if (isset($_ENV['PMA_USER'])) {
        $cfg['Servers'][$i]['auth_type'] = 'config';
        $cfg['Servers'][$i]['user'] = $_ENV['PMA_USER'];
        $cfg['Servers'][$i]['password'] = isset($_ENV['PMA_PASSWORD']) ? $_ENV['PMA_PASSWORD'] : null;
@@ -12,4 +12,4 @@ exec php -S 0.0.0.0:80 -t /www/ \
    -d upload_max_filesize=$PHP_UPLOAD_MAX_FILESIZE \
    -d post_max_size=$PHP_UPLOAD_MAX_FILESIZE \
    -d max_input_vars=$PHP_MAX_INPUT_VARS \
-    -d session.save-path=/sessions
+    -d session.save_path=/sessions
Author	SHA1	Message	Date
Michal Čihař	e713caa214	Remove mcrypt from dependencies, it is not needed with openssl Signed-off-by: Michal Čihař <michal@cihar.com>	2016-06-14 15:45:56 +02:00
Michal Čihař	cce91f08d4	Revert "Switch to PHP 7" Okay, the PHP 7 packages are not yet in released Alpine, we need to wait for next release. This reverts commit `9d0dec3d2e`.	2016-06-14 15:45:15 +02:00
Michal Čihař	9d0dec3d2e	Switch to PHP 7 Fixes #34 Signed-off-by: Michal Čihař <michal@cihar.com>	2016-06-14 15:41:18 +02:00
Michal ČihařandGitHub	563bcafcec	Merge pull request #36 from ssteinerx/Update-base-image-to-Alpine-3.4 Update base image to alpine:latest	2016-06-14 15:39:32 +02:00
Steve SteinerandGitHub	0bc8b4025b	Update base image to alpine:latest As per note in previous version of Dockerfile to switch when 3.4 was out. Also removed comment since it's done.	2016-06-14 09:34:55 -04:00
Michal Čihař	812590e038	Remove PMA_ABSOLUTE_URI as it is no longer needed with 4.6 Signed-off-by: Michal Čihař <michal@cihar.com>	2016-06-10 13:49:55 +02:00
Michal Čihař	7d6f729bc6	Fix PHP configuration name Fixes #32 Signed-off-by: Michal Čihař <michal@cihar.com>	2016-06-10 12:34:58 +02:00
Michal Čihař	593d7f5f96	Include PHP modules for bz2 and zip Fixes #33 Signed-off-by: Michal Čihař <michal@cihar.com>	2016-06-10 12:34:01 +02:00