Merge pull request #5 from LaraDock/develop

Develop
This commit is contained in:
Mahmoud Zalt 2015-09-28 18:36:54 +03:00
commit cf846a9aa7
7 changed files with 30 additions and 40 deletions

View File

@ -135,11 +135,24 @@ What's better than a quick [video](https://www.youtube.com/watch?v=3YQsHe6oF80)
> To find the IP address: > To find the IP address:
> >
> - if you are on Linux, the containers run directly on your localhost so this `127.0.0.1` will be your IP Address. > - if you are on Linux, the containers run directly on your localhost so this `127.0.0.1` will be your IP Address.
> - if you are on MAC using **boot2docker**, run this command while boot2docker is up `boot2docker ip` to get the IP Address. > - if you are on MAC and using **boot2docker**, type `boot2docker ip` when boot2docker is up.
> - if you are on MAC and using **docker-machine**, type `docker-machine ip {VM-Name}` after starting a virtual machine.
> - if you are on Windows, check the Docker documentation for how you get the VM IP Address. > - if you are on Windows, check the Docker documentation for how you get the VM IP Address.
8 - Additional step for `Docker-Machine` users only. *(Skip this if you are not using `Docker-Machine`)*:
8 - Finally run the containers and start coding. a. Edit this file `docker/docker-compose.yml`
b. Uncomment:
```yaml
# extra_hosts:
# - "laravel.dev:xxx.xxx.xxx.xxx"
```
c. Replace `xxx.xxx.xxx.xxx` with your the VM IP address.
9 - Finally run the containers and start coding.
*"Note: Only the first you run this command will take up to 7 minutes (depend on your connection speed) to download the images to your local machine, Only once in life.* *"Note: Only the first you run this command will take up to 7 minutes (depend on your connection speed) to download the images to your local machine, Only once in life.*
@ -147,7 +160,7 @@ What's better than a quick [video](https://www.youtube.com/watch?v=3YQsHe6oF80)
docker-compose up -d docker-compose up -d
``` ```
9 - Open your browser and visit `http://laravel.dev` 10 - Open your browser and visit `http://laravel.dev`
You should see a page like this: You should see a page like this:
![](http://s29.postimg.org/8cvh7wq2f/Screen_Shot_2015_08_21_at_9_23_19_PM.png) ![](http://s29.postimg.org/8cvh7wq2f/Screen_Shot_2015_08_21_at_9_23_19_PM.png)

View File

@ -15,8 +15,9 @@ php-nginx:
links: links:
- mysql - mysql
- redis - redis
- beanstalkd
privileged: true privileged: true
# extra_hosts:
# - "laravel.dev:xxx.xxx.xxx.xxx"
# MySQL Container #---------------------------------------- # MySQL Container #----------------------------------------
mysql: mysql:
@ -45,14 +46,6 @@ redis:
restart: always restart: always
privileged: true privileged: true
# Beanstalkd Container #-----------------------------------
beanstalkd:
image: laradock/beanstalkd:latest
container_name: beanstalkd
ports:
- "11300:11300"
privileged: true
# Data Volume Container #---------------------------------- # Data Volume Container #----------------------------------
data: data:
image: laradock/data:latest image: laradock/data:latest
@ -61,4 +54,12 @@ data:
- /var/lib/mysql - /var/lib/mysql
- /var/lib/redis - /var/lib/redis
# Beanstalkd Container #-----------------------------------
# beanstalkd:
# image: laradock/beanstalkd:latest
# container_name: beanstalkd
# ports:
# - "11300:11300"
# privileged: true
#---------------------------------------------------------- #----------------------------------------------------------

View File

@ -1,5 +1,6 @@
APP_ENV=local APP_ENV=local
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://laravel.dev
APP_KEY=wqgyoHNBQBgPjLorn3pJNGwYlehhXfD3 APP_KEY=wqgyoHNBQBgPjLorn3pJNGwYlehhXfD3
CACHE_DRIVER=redis CACHE_DRIVER=redis

View File

@ -1,5 +1,6 @@
APP_ENV=local APP_ENV=local
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://laravel.dev
APP_KEY=SomeRandomString APP_KEY=SomeRandomString
CACHE_DRIVER=file CACHE_DRIVER=file

View File

@ -32,10 +32,8 @@ class TestingController extends Controller
// Testing Cache (Redis) // Testing Cache (Redis)
Cache::pull('test'); Cache::pull('test');
// Testing Queue (Beanstalkd)
$this->dispatch(new TestingQueue());
return view('welcome'); return view('welcome');
} catch(Exception $e) { } catch(Exception $e) {
echo $e->getMessage(); echo $e->getMessage();
} }

View File

@ -1,24 +0,0 @@
<?php
namespace App\Jobs;
use App\Jobs\Job;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Contracts\Bus\SelfHandling;
use Illuminate\Contracts\Queue\ShouldQueue;
class TestingQueue extends Job implements SelfHandling, ShouldQueue
{
use InteractsWithQueue, SerializesModels;
/**
* Execute the job.
*
* @return void
*/
public function handle()
{
return true;
}
}

View File

@ -26,7 +26,7 @@ return [
| |
*/ */
'url' => 'http://localhost', 'url' => env('APP_URL', 'http://localhost'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------