Update to phpMyAdmin release 4.9.2

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
Improve TravisCI file with steps
2026-08-26 02:24:23 -05:00 · 2019-11-23 07:11:36 -05:00 · 2019-10-22 00:09:47 +02:00 · 2019-10-21 21:03:25 +02:00 · 2019-10-21 21:00:58 +02:00 · 2019-10-17 14:14:21 +08:00
4 changed files with 80 additions and 32 deletions
@@ -2,13 +2,13 @@ services:
  - docker

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

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

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

-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
+_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
@@ -54,7 +54,7 @@ RUN { \
    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 4.9.1
+ENV VERSION 4.9.2
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION

@@ -51,7 +51,7 @@ RUN { \
    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 4.9.1
+ENV VERSION 4.9.2
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION

@@ -54,7 +54,7 @@ RUN { \
    } > /usr/local/etc/php/conf.d/phpmyadmin-misc.ini

 # Calculate download URL
-ENV VERSION 4.9.1
+ENV VERSION 4.9.2
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
 LABEL version=$VERSION
Author	SHA1	Message	Date
Isaac Bennetch	0343ca5338	Update to phpMyAdmin release 4.9.2 Signed-off-by: Isaac Bennetch <bennetch@gmail.com>	2019-11-23 07:11:36 -05:00
William Desportes	9d1872d753	Improve TravisCI file with steps Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-10-22 00:09:47 +02:00
William Desportes	5f2beb027a	Revert "Increase limits for upload and post" This reverts commit `e9d1da4ebc`.	2019-10-21 21:03:25 +02:00
William Desportes	0bd0e9a958	Merge #251 - improve/fix Travis CI file Signed-off-by: William Desportes <williamdes@wdes.fr>	2019-10-21 21:00:58 +02:00
0X8CandGitHub	8dfcf48b25	Update .travis.yml	2019-10-17 14:14:21 +08:00
William Desportes	e9d1da4ebc	Increase limits for upload and post Ref: #238 Closes: #240 Closes: #239 Closes: #233 Closes: #189	2019-09-30 19:19:06 +02:00