Merge pull request #10 from LaraDock/master

Update fork
This commit is contained in:
Luciano Jr 2016-09-04 14:36:12 +01:00 committed by GitHub
commit b2da8aeb3f
3 changed files with 28 additions and 4 deletions

View File

@ -49,6 +49,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
- [Use Redis](#Use-Redis) - [Use Redis](#Use-Redis)
- [Use Mongo](#Use-Mongo) - [Use Mongo](#Use-Mongo)
- [Use phpMyAdmin](#Use-phpMyAdmin) - [Use phpMyAdmin](#Use-phpMyAdmin)
- [Use pgAdmin](#Use-pgAdmin)
- [PHP](#PHP) - [PHP](#PHP)
- [Install PHP Extensions](#Install-PHP-Extensions) - [Install PHP Extensions](#Install-PHP-Extensions)
- [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version) - [Change the PHP-FPM Version](#Change-the-PHP-FPM-Version)
@ -134,6 +135,7 @@ Let's see how easy it is to install `NGINX`, `PHP`, `Composer`, `MySQL` and `Red
- **Tools:** - **Tools:**
- Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...) - Workspace (PHP7-CLI, Composer, Git, Node, Gulp, SQLite, Vim, Nano, cURL...)
- phpMyAdmin - phpMyAdmin
- pgAdmin
>If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :) >If you can't find your Software, build it yourself and add it to this list. Contributions are welcomed :)
@ -251,7 +253,7 @@ docker-compose up -d nginx mysql
You can select your own combination of Containers form the list below: 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`, `workspace`, `phpmyadmin`, `aerospike`. `nginx`, `hhvm`, `php-fpm`, `mysql`, `redis`, `postgres`, `mariadb`, `neo4j`, `mongo`, `apache2`, `caddy`, `memcached`, `beanstalkd`, `beanstalkd-console`, `rabbitmq`, `workspace`, `phpmyadmin`, `aerospike`, `pgadmin`.
**Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command. **Note**: `workspace` and `php-fpm` will run automatically in most of the cases, so no need to specify them in the `up` command.
@ -726,7 +728,17 @@ docker-compose up -d mariadb phpmyadmin
2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080` 2 - Open your browser and visit the localhost on port **8080**: `http://localhost:8080`
<br>
<a name="Use-pgAdmin"></a>
### Use pgAdmin
1 - Run the pgAdmin Container (`pgadmin`) with the `docker-compose up` command. Example:
```bash
docker-compose up -d postgres pgadmin
```
2 - Open your browser and visit the localhost on port **5050**: `http://localhost:5050`
<br> <br>

View File

@ -49,8 +49,6 @@ services:
extra_hosts: extra_hosts:
# IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts) # IMPORTANT: Replace with your Docker Host IP (will be appended to /etc/hosts)
- "dockerhost:10.0.75.1" - "dockerhost:10.0.75.1"
ports:
- "22:22"
environment: environment:
# IMPORTANT: Set the Remote Interpreter entry matching name to `laravel` # IMPORTANT: Set the Remote Interpreter entry matching name to `laravel`
- PHP_IDE_CONFIG="serverName=laravel" - PHP_IDE_CONFIG="serverName=laravel"
@ -265,6 +263,15 @@ services:
# for mariadb container # for mariadb container
# - "mariadb:db" # - "mariadb:db"
### pgAdmin Container ##################################
pgadmin:
build: ./pgadmin
ports:
- "5050:5050"
links:
- postgres
### Laravel Application Code Container ###################### ### Laravel Application Code Container ######################
volumes_source: volumes_source:
@ -281,7 +288,7 @@ services:
image: tianon/true image: tianon/true
volumes: volumes:
- ./data/mysql:/var/lib/mysql - ./data/mysql:/var/lib/mysql
- ./data/postgres:/var/lib/postgres - ./data/postgres:/var/lib/postgresql/data
- ./data/memcached:/var/lib/memcached - ./data/memcached:/var/lib/memcached
- ./data/redis:/data - ./data/redis:/data
- ./data/neo4j:/var/lib/neo4j/data - ./data/neo4j:/var/lib/neo4j/data

5
pgadmin/Dockerfile Normal file
View File

@ -0,0 +1,5 @@
FROM fenglc/pgadmin4
MAINTAINER Bo-Yi Wu <appleboy.tw@gmail.com>
EXPOSE 5050