From e1036185ae9162dfdeb60f2ecddbd7271ad7ed38 Mon Sep 17 00:00:00 2001 From: ZeroC0D3 Team Date: Sun, 26 Mar 2017 09:47:03 +0700 Subject: [PATCH 01/11] Fixing from #708 (#715) * Fixing workspace_yarn_version * Remove duplicate type MAINTAINER * Update README.md --- docker-compose.yml | 60 ++++++++++++++++++++--------------------- workspace/Dockerfile-71 | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 57eb2737..57b0cf51 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -393,33 +393,33 @@ services: ### Volumes Setup ########################################### volumes: - mysql: - driver: "local" - mssql: - driver: "local" - postgres: - driver: "local" - memcached: - driver: "local" - redis: - driver: "local" - neo4j: - driver: "local" - mariadb: - driver: "local" - mongo: - driver: "local" - minio: - driver: "local" - rethinkdb: - driver: "local" - phpmyadmin: - driver: "local" - aerospike: - driver: "local" - caddy: - driver: "local" - elasticsearch-data: - driver: "local" - elasticsearch-plugins: - driver: "local" + mysql: + driver: "local" + mssql: + driver: "local" + postgres: + driver: "local" + memcached: + driver: "local" + redis: + driver: "local" + neo4j: + driver: "local" + mariadb: + driver: "local" + mongo: + driver: "local" + minio: + driver: "local" + rethinkdb: + driver: "local" + phpmyadmin: + driver: "local" + aerospike: + driver: "local" + caddy: + driver: "local" + elasticsearch-data: + driver: "local" + elasticsearch-plugins: + driver: "local" diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 1f9fb855..43312667 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -12,7 +12,7 @@ FROM laradock/workspace:1.3 # placeholder. Need change after new image would be built. -MAINTAINER MAINTAINER Mahmoud Zalt +MAINTAINER Mahmoud Zalt # #-------------------------------------------------------------------------- From f05512fd1d6676536c1920027f7a81675adcb461 Mon Sep 17 00:00:00 2001 From: Mahmoud Zalt Date: Wed, 29 Mar 2017 10:08:55 -0400 Subject: [PATCH 02/11] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d9e5f8a..df0ca19a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,8 @@ Laradock is a Docker PHP development environment that facilitate running **PHP** - [Philippe Trépanier](https://github.com/philtrep) (philtrep) - [Mike Erickson](https://github.com/mikeerickson) (mikeerickson) - [Dwi Fahni Denni](https://github.com/zeroc0d3) (zeroc0d3) -- Join Us. +- [Thor Erik](https://github.com/thorerik) (thorerik) +- Contribute and join us! **Amazing Contributors:** From 98c9fdff24bee71d7ff8f85fa4c7f370654e5289 Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Wed, 29 Mar 2017 22:04:59 -0700 Subject: [PATCH 03/11] Create Adminer dockerfile --- adminer/Dockerfile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 adminer/Dockerfile diff --git a/adminer/Dockerfile b/adminer/Dockerfile new file mode 100644 index 00000000..20caaede --- /dev/null +++ b/adminer/Dockerfile @@ -0,0 +1,9 @@ +FROM adminer/adminer:fastcgi + +MAINTAINER Patrick Artounian + +# Add volume for sessions to allow session persistence +VOLUME /sessions + +# We expose Adminer on port 80 +EXPOSE 80 From a8d79378894665c6f1d386c3b87f258855d8ced0 Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Wed, 29 Mar 2017 22:12:53 -0700 Subject: [PATCH 04/11] Add ADM_PORT to env-example --- env-example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/env-example b/env-example index e1d1efa1..d773a6b3 100644 --- a/env-example +++ b/env-example @@ -122,6 +122,9 @@ PMA_PASSWORD=secret PMA_ROOT_PASSWORD=secret PMA_PORT=88 +### Adminer Container +ADM_PORT=88 + ### MISC # Replace with your Docker Host IP (will be appended to /etc/hosts) DOCKER_HOST_IP=10.0.75.1 From 3d2eb81cd578c11de20b4113ef1f8895f59e46c2 Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Wed, 29 Mar 2017 22:13:33 -0700 Subject: [PATCH 05/11] Add necessary Adminer config below PMA sections --- docker-compose.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 57b0cf51..16c0b621 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -339,6 +339,15 @@ services: depends_on: - "${PMA_DB_ENGINE}" +### Adminer Container #################################### + + adminer: + build: ./adminer + ports: + - "${ADM_PORT}:80" + depends_on: + - php-fpm + ### pgAdmin Container ####################################### pgadmin: @@ -415,6 +424,8 @@ volumes: driver: "local" phpmyadmin: driver: "local" + adminer: + driver: "local" aerospike: driver: "local" caddy: From 4efb5b43c67e8ac882ebd07f233dc1ca3cd36cbd Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Wed, 29 Mar 2017 22:23:49 -0700 Subject: [PATCH 06/11] Add Adminer to docs --- .../_settings/content/documentation/index.md | 19 +++++++++++++++++++ .../content/getting-started/index.md | 2 +- .../_settings/content/introduction/index.md | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/DOCUMENTATION/_settings/content/documentation/index.md b/DOCUMENTATION/_settings/content/documentation/index.md index 7d4addc9..a988ae53 100644 --- a/DOCUMENTATION/_settings/content/documentation/index.md +++ b/DOCUMENTATION/_settings/content/documentation/index.md @@ -706,6 +706,25 @@ docker-compose up -d mariadb phpmyadmin +
+ +## Use Adminer + +1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example: + +```bash +# use with nginx +# must use it as fastcgi is required +docker-compose up -d nginx adminer +``` + +2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080` + + + + + +
## Use PgAdmin diff --git a/DOCUMENTATION/_settings/content/getting-started/index.md b/DOCUMENTATION/_settings/content/getting-started/index.md index 6324936d..676dbb1f 100644 --- a/DOCUMENTATION/_settings/content/getting-started/index.md +++ b/DOCUMENTATION/_settings/content/getting-started/index.md @@ -168,7 +168,7 @@ docker-compose up -d nginx mysql You can select your own combination of containers form the list below: -> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...! +> `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `beanstalkd-console`, `workspace`, `phpmyadmin`, `adminer`, `aerospike`, `pgadmin`, `elasticsearch`, `rethinkdb`, `postgres-postgis`, `certbot`, `mailhog`, `minio` and more...! *(Please note that sometimes we forget to update the docs, so check the `docker-compose.yml` file to see an updated list of all available containers).* diff --git a/DOCUMENTATION/_settings/content/introduction/index.md b/DOCUMENTATION/_settings/content/introduction/index.md index 44ae7a70..904ed152 100644 --- a/DOCUMENTATION/_settings/content/introduction/index.md +++ b/DOCUMENTATION/_settings/content/introduction/index.md @@ -169,6 +169,7 @@ What's better than a **Demo Video**: - RabbitMQ Console - **Tools:** - PhpMyAdmin + - Adminer - PgAdmin - ElasticSearch - Selenium From c193c5d03bc487feccf314e01d9f94ad605a432b Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Wed, 29 Mar 2017 22:29:18 -0700 Subject: [PATCH 07/11] Correct Adminer repo --- adminer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 20caaede..01c11562 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -1,4 +1,4 @@ -FROM adminer/adminer:fastcgi +FROM adminer:fastcgi MAINTAINER Patrick Artounian From 68dd2fd019ac9829e215437f290f9f2a0ef60d09 Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Wed, 29 Mar 2017 22:50:01 -0700 Subject: [PATCH 08/11] Switch from adminer:fastcgi to adminer:latest This is to allow standalone usage. --- adminer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 01c11562..3d4bd65d 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -1,4 +1,4 @@ -FROM adminer:fastcgi +FROM adminer:latest MAINTAINER Patrick Artounian From 662280c139eef0030b5949ae4beae6dd81952325 Mon Sep 17 00:00:00 2001 From: "Christian Maioli (@christianmaioli)" Date: Thu, 30 Mar 2017 17:26:20 -0300 Subject: [PATCH 09/11] Fixed typo --- DOCUMENTATION/_settings/content/getting-started/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DOCUMENTATION/_settings/content/getting-started/index.md b/DOCUMENTATION/_settings/content/getting-started/index.md index 6324936d..b0d3fc29 100644 --- a/DOCUMENTATION/_settings/content/getting-started/index.md +++ b/DOCUMENTATION/_settings/content/getting-started/index.md @@ -138,7 +138,7 @@ You can rename the config files, project folders and domains as you like, just m If you are using **Docker Toolbox** (VM), do one of the following: - Upgrade to Docker [Native](https://www.docker.com/products/docker) for Mac/Windows (Recommended). Check out [Upgrading Laradock](#upgrading-laradock) -- Use Laradock v3.* (Visit the `Laradock-ToolBox` [Branch](https://github.com/laradock/laradock/tree/Laradock-ToolBox)). +- Use Laradock v3.* (Visit the `LaraDock-ToolBox` [Branch](https://github.com/laradock/laradock/tree/LaraDock-ToolBox)).
From a11206d4ba5f802ad0d4d9eb9cc0159755434331 Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Thu, 30 Mar 2017 18:19:06 -0700 Subject: [PATCH 10/11] Change adminer expose port to 8080 Most webservers default to 80, but Adminer's docker container runs on 8080. --- adminer/Dockerfile | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 3d4bd65d..058170cc 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -5,5 +5,5 @@ MAINTAINER Patrick Artounian # Add volume for sessions to allow session persistence VOLUME /sessions -# We expose Adminer on port 80 -EXPOSE 80 +# We expose Adminer on port 8080 (Adminer's default) +EXPOSE 8080 diff --git a/docker-compose.yml b/docker-compose.yml index 16c0b621..5954433b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -344,7 +344,7 @@ services: adminer: build: ./adminer ports: - - "${ADM_PORT}:80" + - "${ADM_PORT}:8080" depends_on: - php-fpm From 269732d8ea008d2b979263034b4915a52f8a32a5 Mon Sep 17 00:00:00 2001 From: Patrick Artounian Date: Thu, 30 Mar 2017 18:25:29 -0700 Subject: [PATCH 11/11] Remove comment about requiring nginx/fastcgi --- DOCUMENTATION/_settings/content/documentation/index.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/DOCUMENTATION/_settings/content/documentation/index.md b/DOCUMENTATION/_settings/content/documentation/index.md index a988ae53..a62d2e8e 100644 --- a/DOCUMENTATION/_settings/content/documentation/index.md +++ b/DOCUMENTATION/_settings/content/documentation/index.md @@ -713,9 +713,7 @@ docker-compose up -d mariadb phpmyadmin 1 - Run the Adminer Container (`adminer`) with the `docker-compose up` command. Example: ```bash -# use with nginx -# must use it as fastcgi is required -docker-compose up -d nginx adminer +docker-compose up -d adminer ``` 2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080`