From 561eba6204449f6c74aad9e98c37bc4f2e80713c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=85=8B?= Date: Fri, 25 Sep 2020 20:33:31 +0800 Subject: [PATCH 1/3] feat: Add support for Adminer designs --- docker-compose.yml | 2 ++ env-example | 1 + 2 files changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index d0b0dcca..5beb5c0f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -813,6 +813,8 @@ services: context: ./adminer args: - INSTALL_MSSQL=${ADM_INSTALL_MSSQL} + environment: + - ADMINER_DESIGN=${ADM_DESIGN} ports: - "${ADM_PORT}:8080" depends_on: diff --git a/env-example b/env-example index 95fbba58..50059fb9 100644 --- a/env-example +++ b/env-example @@ -428,6 +428,7 @@ MINIO_PORT=9000 ADM_PORT=8081 ADM_INSTALL_MSSQL=false +ADM_DESIGN=pepa-linha ### PHP MY ADMIN ########################################## From 80c4e620ac6c4430d6d09bb7bac1410e2f52bab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=85=8B?= Date: Sat, 26 Sep 2020 02:17:15 +0800 Subject: [PATCH 2/3] feat: Add support for loading plugins and specifying the default host --- DOCUMENTATION/content/documentation/index.md | 8 ++++++++ docker-compose.yml | 2 ++ env-example | 2 ++ 3 files changed, 12 insertions(+) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index c51a05d1..c3e2638e 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -1077,6 +1077,14 @@ docker-compose up -d adminer 2 - Open your browser and visit the localhost on port **8081**: `http://localhost:8081` +#### Additional Notes + +- You can load plugins in the `ADM_PLUGINS` variable in the `.env` file. If a plugin requires parameters to work correctly you will need to add a custom file to the container. [Find more info in section 'Loading plugins'](https://hub.docker.com/_/adminer). + +- You can choose a design in the `ADM_DESIGN` variable in the `.env` file. [Find more info in section 'Choosing a design'](https://hub.docker.com/_/adminer). + +- You can specify the default host with the `ADM_DEFAULT_SERVER` variable in the `.env` file. This is useful if you are connecting to an external server or a docker container named something other than the default `mysql`. + **Note:** We've locked Adminer to version 4.3.0 as at the time of writing [it contained a major bug](https://sourceforge.net/p/adminer/bugs-and-features/548/) preventing PostgreSQL users from logging in. If that bug is fixed (or if you're not using PostgreSQL) feel free to set Adminer to the latest version within [the Dockerfile](https://github.com/laradock/laradock/blob/master/adminer/Dockerfile#L1): `FROM adminer:latest` diff --git a/docker-compose.yml b/docker-compose.yml index 5beb5c0f..cb056aca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -814,7 +814,9 @@ services: args: - INSTALL_MSSQL=${ADM_INSTALL_MSSQL} environment: + - ADMINER_PLUGINS=${ADM_PLUGINS} - ADMINER_DESIGN=${ADM_DESIGN} + - ADMINER_DEFAULT_SERVER=${ADM_DEFAULT_SERVER} ports: - "${ADM_PORT}:8080" depends_on: diff --git a/env-example b/env-example index 50059fb9..477b63ad 100644 --- a/env-example +++ b/env-example @@ -428,7 +428,9 @@ MINIO_PORT=9000 ADM_PORT=8081 ADM_INSTALL_MSSQL=false +ADM_PLUGINS= ADM_DESIGN=pepa-linha +ADM_DEFAULT_SERVER=mysql ### PHP MY ADMIN ########################################## From 363e973f5cda99267215bf4ecc0fe1b3b3116060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=85=8B?= Date: Sat, 26 Sep 2020 02:22:21 +0800 Subject: [PATCH 3/3] docs: Remove the outdated note and clean up trailing spaces --- DOCUMENTATION/content/documentation/index.md | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/DOCUMENTATION/content/documentation/index.md b/DOCUMENTATION/content/documentation/index.md index c3e2638e..cecfa396 100644 --- a/DOCUMENTATION/content/documentation/index.md +++ b/DOCUMENTATION/content/documentation/index.md @@ -874,14 +874,14 @@ run from any cli:
`curl -X PURGE https://yourwebsite.com/`. 2. How to reload varnish?
`docker container exec proxy varnishreload` 3. Which varnish commands are allowed? - - varnishadm - - varnishd - - varnishhist - - varnishlog - - varnishncsa - - varnishreload - - varnishstat - - varnishtest + - varnishadm + - varnishd + - varnishhist + - varnishlog + - varnishncsa + - varnishreload + - varnishstat + - varnishtest - varnishtop 4. How to reload Nginx?
`docker exec Nginx nginx -t`
@@ -1085,7 +1085,6 @@ docker-compose up -d adminer - You can specify the default host with the `ADM_DEFAULT_SERVER` variable in the `.env` file. This is useful if you are connecting to an external server or a docker container named something other than the default `mysql`. -**Note:** We've locked Adminer to version 4.3.0 as at the time of writing [it contained a major bug](https://sourceforge.net/p/adminer/bugs-and-features/548/) preventing PostgreSQL users from logging in. If that bug is fixed (or if you're not using PostgreSQL) feel free to set Adminer to the latest version within [the Dockerfile](https://github.com/laradock/laradock/blob/master/adminer/Dockerfile#L1): `FROM adminer:latest` @@ -1220,7 +1219,7 @@ docker-compose up -d elasticsearch ```bash docker-compose exec elasticsearch /usr/share/elasticsearch/bin/plugin install {plugin-name} ``` -For ElasticSearch 5.0 and above, the previous "plugin" command has been renamed to "elasticsearch-plguin". +For ElasticSearch 5.0 and above, the previous "plugin" command has been renamed to "elasticsearch-plguin". Use the following instead: ```bash