starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-24 10:13:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
616 Commits 4 Branches 64 Tags
50b7203dbf0e254b23fd5e53509680fa67b5e8ec
Commit Graph
616 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
William Desportes 50b7203dbf Merge #434 - Enable remoteip mod for Apache 2024-04-02 20:02:07 +02:00
William Desportes aa656af9c5 Bump GitHub actions 2024-04-02 20:00:29 +02:00
William Desportes 79a51154c1 Use docker compose plugin instead of the old binary 2024-04-02 19:56:17 +02:00
MelleandWilliam Desportes 215f36692f Enable remoteip for Apache 
Co-Authored-by: William Desportes <williamdes@wdes.fr>
 2024-04-02 19:52:10 +02:00
William Desportes 272944cc5a Fix #287 - Verify the version syntax in *.sh to avoid command injection 2023-08-03 16:14:42 +02:00
William Desportes 6517adbfe3 Fix #421 - Document PMA_SOCKET and PMA_SOCKETS 2023-08-03 15:52:13 +02:00
William Desportes 30db079919 Merge #418 - improve the fix made in #417 
Ref: 87bbb8dd8f
 2023-07-04 18:14:25 +02:00
Eric de Ruiter da4b8f273a Better fix for #416 
This applies the fixes suggested in https://github.com/docker-library/official-images/pull/14960
 2023-07-04 14:39:51 +02:00
William Desportes 692333aa2d Update generate-stackbrew-library.sh from upstream build pack 
To reduce further diffs when it will be updated to use versions.json if this happens

Ref: https://github.com/docker-library/buildpack-deps/blob/master/generate-stackbrew-library.sh
 2023-06-30 14:21:33 +02:00
William Desportes 8674356a6d Merge #408 - Refactor update.sh 2023-06-30 13:51:41 +02:00
William Desportes a5b42082a8 Update CHANGELOG.md 
Ref: 271a3e6a3e

[ci skip]
 2023-06-30 13:48:41 +02:00
William Desportes 3c0561bd6e Run update.sh 2023-06-30 13:47:04 +02:00
William Desportes 636af2024a Revert "Auxiliary commit to revert individual files from d10b78cde45c4b6e081e4e5e38f354347838fb6f" 
This reverts commit f5606d330139fca0dcb6ab97ac4826c5cbed1803.
 2023-06-30 13:46:40 +02:00
William Desportes 1c138c510c Revert "Auxiliary commit to revert individual files from f650628a767be59159f10b9f9c18821235fb2d12" 
This reverts commit 25b588cca10026c25bb856f6fb8bba2767e7af9a.
 2023-06-30 13:45:42 +02:00
William Desportes 813fcf8410 Revert "Auxiliary commit to revert individual files from 5239485cfc6ed1099b15d634dc9431ddabb938ab" 
This reverts commit bc440d32df7d8a2eea760fd85ae81564f7b77be8.
 2023-06-30 13:42:08 +02:00
William Desportes d10b78cde4 Revert "Auxiliary commit to revert individual files from e68cbb87af581149bf433be6b94600c0288aa452" 
This reverts commit 5d0a2c22adbb918ceb11d84eaddeff0750df759d.
 2023-06-30 13:38:42 +02:00
William Desportes 644a36f7a0 Revert "Run update.sh" 
This reverts commit 6d73dc8728.
 2023-06-30 13:37:41 +02:00
William Desportes 2d43a62d20 Add a CHANGELOG entry for #415 
Pull-request: #415

[ci skip]
 2023-06-30 11:28:46 +02:00
William Desportes 328b498f51 Merge #415 - add extension bcmath for 2nd factor authentication 2023-06-30 11:27:18 +02:00
William Desportes b3cb5de98e Make GitHub actions sed back the config to MySQL mode if needed 2023-06-29 19:58:50 +02:00
William Desportes 87e2c6a325 Fix mysqladmin and MYSQL_ROOT_PASSWORD not existing anymore on MariaDB 11 2023-06-29 19:50:18 +02:00
William Desportes 87bbb8dd8f Merge #417 - Fix #416 - for debian 12 issue that caused libraries for extensions to be uninstalled 
Fixes: #416
 2023-06-29 19:26:54 +02:00
Eric de Ruiter ab6a09ad9f Added extra sanity check + better output in case of failure 2023-06-29 18:34:21 +02:00
Eric de Ruiter 37b7cff908 Fix for debian 12 issue (#416) that caused libraries for extensions to be uninstalled 2023-06-29 16:08:56 +02:00
William Desportes adf9118a38 Merge #401 - Add back a /sessions volume for sessions persistence 2023-06-29 13:44:41 +02:00
William Desportes a6c091bd8c Add a test for #401 - /etc/phpmyadmin/conf.d/ 2023-06-29 13:22:07 +02:00
William Desportes d455a71d95 Merge #399 - Add back a /sessions volume for sessions persistence 2023-06-29 13:11:48 +02:00
William Desportes 948bf2d147 Merge #411 - Update to PHP 8.2 2023-06-29 13:08:10 +02:00
William Desportes e1da7554b4 Use MariaDB LTS and test on each MariaDB LTS 2023-06-29 12:59:06 +02:00
y.kandGitHub a31c702cd5 Update Dockerfile-alpine.template 
add extension bcmath for 2-factor authentication
 2023-06-25 13:17:41 +08:00
y.kandGitHub 7432be89e0 Update Dockerfile-debian.template 
add extension bcmath for 2-factor authentication
 2023-06-25 13:16:17 +08:00
Benedikt Franke 67f9b75357 Update to PHP 8.2 2023-06-14 09:38:34 +02:00
William Desportes 9a7991c3f2 Merge #407 - Add no-network option on alpine Dockerfile 
Pull-request: #407
 2023-06-01 19:27:22 +02:00
Daniel Rudolf 271a3e6a3e Update CHANGELOG.md 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:51:17 +02:00
Daniel Rudolf 6d73dc8728 Run update.sh 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:48:07 +02:00
Daniel Rudolf e68cbb87af Add versions.json 
'versions.json' contains information about the latest branches (currently phpMyAdmin 5.2 only) and variants. It was inspired by PHP's official Docker image and is managed by `update.sh`. There's no need to edit this file manually, just run `update.sh`.

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:45:29 +02:00
Daniel Rudolf 5ee9a9ced5 update.sh: Add 'DO NOT EDIT' note to generated Dockerfiles 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:41:20 +02:00
Daniel Rudolf 2cb9a6214e update.sh: Add some comments and code cleanup 
This commit includes no functional changes.

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:36:36 +02:00
Daniel Rudolf 4a5875f495 update.sh: Add 'php_version' variable 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:26:05 +02:00
Daniel Rudolf 5239485cfc update.sh: Bake GPG key, sha256 and version directly into Dockerfiles 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:22:09 +02:00
Daniel Rudolf f650628a76 update.sh: Bake download URLs directly into Dockerfiles 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:19:53 +02:00
Daniel Rudolf dbfffe50c7 update.sh: Add 'create_variant' function 
This commit includes no functional changes besides a new debug info.

Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:12:18 +02:00
Daniel Rudolf fb5c1a2104 update.sh: Increase error verbosity 
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
 2023-06-01 16:06:58 +02:00
J0WI 7967e63883 Add no-network option 2023-05-31 14:36:01 +02:00
PigoandGitHub 0730e5188e Adding Custom Configuration in /etc/phpmyadmin/conf.d 2023-03-29 19:56:08 +08:00
PigoandGitHub 47a3db45ad Adding Custom Configuration in /etc/phpmyadmin/conf.d 2023-03-29 19:55:13 +08:00
PigoandGitHub f8edb1ca87 check /etc/phpmyadmin/conf.d exists 
/etc/phpmyadmin/conf.d need to check whether  /etc/phpmyadmin/conf.d exists
 2023-03-29 17:30:57 +08:00
PigoandGitHub a03d55e76a Support additional configurations 
#319
 2023-03-29 11:15:30 +08:00
William Desportes 0006406e35 Add a CHANGELOG entry for #133 
Pull-request: #394
 2023-03-11 17:09:52 +01:00
William Desportes 7f5a48b7c3 Merge #394 - Fix #133 - Add TZ env var to change PHP date.timezone 
Pull-request: #394
Fixes: #133
 2023-03-11 17:07:23 +01:00