Compare commits

..

5 Commits

Author SHA1 Message Date
e5e04e4e18 update the readme: exec command to run 2016-06-23 08:58:43 +03:00
44d8720400 Merge pull request #115 from appleboy/patch-2
Change command about enter workspace container.
2016-06-23 08:52:37 +03:00
f0200626ba Merge pull request #114 from Kauhat/master
Added support to conditionally install Prestissimo
2016-06-23 08:36:48 +03:00
69406db3e0 Change command about enter workspace container. 2016-06-23 13:16:52 +08:00
bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
4 changed files with 18 additions and 21 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
/logs
/logs
.env

View File

@ -221,7 +221,7 @@ You can select your own combination of container form this list:
3 - Enter the Workspace container, to execute commands like (Artisan, Composer, PHPUnit, Gulp, ...).
```bash
docker exec -it {Workspace-Container-Name} bash
docker-compose run workspace bash
```
Replace `{Workspace-Container-Name}` with your Workspace container name.
<br>
@ -323,7 +323,7 @@ docker-compose down
2 - enter any container using:
```bash
docker exec -it {container-name} bash
docker-compose run {container-name} bash
```
3 - to exit a container, type `exit`.
@ -494,19 +494,13 @@ You can run artisan commands and many other Terminal commands from the Workspace
docker-compose up -d workspace // ..and all your other containers
```
2 - Find the Workspace container name:
2 - Enter the Workspace container:
```bash
docker-compose ps
docker-compose run workspace /bin/bash
```
3 - Enter the Workspace container:
```bash
docker exec -it {workspace-container-name} bash
```
4 - Run anything you want :)
3 - Run anything you want :)
```bash
php artisan
@ -518,13 +512,6 @@ Composer update
phpunit
```
<br>
<a name="Use-Redis"></a>
### Use Redis
@ -627,7 +614,7 @@ More details about this [here](https://github.com/jenssegers/laravel-mongodb#ins
5 - Test it:
- First let your Models extend from the Mongo Eloquent Model. Check the [documentation](https://github.com/jenssegers/laravel-mongodb#eloquent).
- Enter the Workspace Continer `docker exec -it laradock_workspace_1 bash`.
- Enter the Workspace Continer `docker-compose run workspace bash`.
- Migrate the Database `php artisan migrate`.

View File

@ -153,7 +153,10 @@ services:
### Workspace Utilities Container ###########################
workspace:
build: ./workspace
build:
context: ./workspace
args:
INSTALL_PRESTISSIMO: ${INSTALL_PRESTISSIMO}
volumes_from:
- application
tty: true

View File

@ -88,3 +88,9 @@ RUN . ~/.bashrc
RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
WORKDIR /var/www/laravel
# Install optional software
ARG INSTALL_PRESTISSIMO=false
RUN if [ "$INSTALL_PRESTISSIMO" = true ] ; then \
composer global require "hirak/prestissimo:^0.3"; \
fi