Merge pull request #122 from LaraDock/Hotfix/mongo

Hotfix/mongo
Merge branch 'zhikiri-hotfix/mongo-support'
2016-06-27 14:00:09 +03:00 · 2016-06-27 13:59:24 +03:00 · 2016-06-27 13:58:48 +03:00 · 2016-06-27 13:45:37 +03:00 · 2016-06-27 11:30:25 +03:00 · 2016-06-25 20:38:54 +03:00
4 changed files with 66 additions and 31 deletions
--- a/README.md
+++ b/README.md
@ -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-compose run workspace bash
+docker exec -it {Workspace-Container-Name} 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-compose run {container-name} bash
+docker exec -it {container-name} bash
 ```
 3 - to exit a container, type `exit`.

@ -494,13 +494,19 @@ You can run artisan commands and many other Terminal commands from the Workspace
 docker-compose up -d workspace // ..and all your other containers
 ```

-2 - Enter the Workspace container:
+2 - Find the Workspace container name:

 ```bash
-docker-compose run workspace /bin/bash
+docker-compose ps
 ```

-3 - Run anything you want :)
+3 - Enter the Workspace container:
+
+```bash
+docker exec -it {workspace-container-name} bash
+```
+
+4 - Run anything you want :)

 ```bash
 php artisan
@ -614,7 +620,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-compose run workspace bash`.
+- Enter the Workspace Container `docker exec -it laradock_workspace_1 bash`.
 - Migrate the Database `php artisan migrate`.


@ -860,8 +866,22 @@ Additionally, you can contact Mahmoud Zalt (the creator of this project) via a d

 ## Credits

+**Creator:**
+
 - [Mahmoud Zalt](https://github.com/Mahmoudz)  (Twitter [@Mahmoud_Zalt](https://twitter.com/Mahmoud_Zalt))
- [Awesome list of contributors](https://github.com/LaraDock/laradock/graphs/contributors)
+
+**Main Contributors:**
+
+- [Bo-Yi Wu](https://github.com/appleboy)
+- [Amin Mkh](https://github.com/AminMkh)
+- [Matthew Tonkin Dunn](https://github.com/mattythebatty)
+- [Benmag](https://github.com/benmag)
+
+**Awesome People:**
+
+- [Contributors](https://github.com/LaraDock/laradock/graphs/contributors)
+- [Supporters](https://github.com/LaraDock/laradock/issues?utf8=%E2%9C%93&q=)
+

 ## License

--- a/php-fpm/Dockerfile-55
+++ b/php-fpm/Dockerfile-55
@ -11,9 +11,17 @@ RUN apt-get update && apt-get install -y \
    curl \
    libpng12-dev \
    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
    --no-install-recommends \
    && rm -r /var/lib/apt/lists/*

+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
 # configure gd library
 RUN docker-php-ext-configure gd \
    --enable-gd-native-ttf \
@ -33,9 +41,6 @@ RUN pecl install memcached \
 RUN pecl install xdebug \
    && docker-php-ext-enable xdebug

-# Install mongodb driver
-RUN pecl install mongodb
-
 RUN usermod -u 1000 www-data

 WORKDIR /var/www/laravel
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@ -11,9 +11,17 @@ RUN apt-get update && apt-get install -y \
    curl \
    libpng12-dev \
    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
    --no-install-recommends \
    && rm -r /var/lib/apt/lists/*

+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
 # configure gd library
 RUN docker-php-ext-configure gd \
    --enable-gd-native-ttf \
@ -33,9 +41,6 @@ RUN pecl install memcached \
 RUN pecl install xdebug \
    && docker-php-ext-enable xdebug

-# Install mongodb driver
-RUN pecl install mongodb
-
 RUN usermod -u 1000 www-data

 WORKDIR /var/www/laravel
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -11,9 +11,17 @@ RUN apt-get update && apt-get install -y \
    curl \
    libpng12-dev \
    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
    --no-install-recommends \
    && rm -r /var/lib/apt/lists/*

+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
 # configure gd library
 RUN docker-php-ext-configure gd \
    --enable-gd-native-ttf \
@ -37,9 +45,6 @@ RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-m
 RUN pecl install xdebug \
    && docker-php-ext-enable xdebug

-# Install mongodb driver
-RUN pecl install mongodb
-
 RUN usermod -u 1000 www-data

 WORKDIR /var/www/laravel
Author	SHA1	Message	Date
Mahmoud Zalt	243392444f	Merge pull request #122 from LaraDock/Hotfix/mongo Hotfix/mongo	2016-06-27 14:00:09 +03:00
Mahmoud Zalt	72a8fc049d	Merge branch 'zhikiri-hotfix/mongo-support' * zhikiri-hotfix/mongo-support: Fix conflict merging zhikiri-hotfix/mongo-support	2016-06-27 13:59:24 +03:00
Mahmoud Zalt	de6db93da8	Fix conflict merging zhikiri-hotfix/mongo-support	2016-06-27 13:58:48 +03:00
Mahmoud Zalt	1af9dc5ac2	Merge pull request #121 from zhikiri/feature/mcrypt-extension Added supporting of the mcrypt extenstion	2016-06-27 13:45:37 +03:00
zhikiri	62878e7c49	Added supporting of the mcrypt extenstion	2016-06-27 11:30:25 +03:00
Mahmoud Zalt	3cd1f070e1	Merge pull request #118 from appleboy/patch-5 remove duplicate white spaces	2016-06-25 20:38:54 +03:00
Bo-Yi Wu	fb5ea7f42c	remove duplicate white spaces Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2016-06-25 19:40:36 +08:00
Mahmoud Zalt	aa8be6f95b	list the contributors names in the readme @benmag @mattythebatty @AminMkh @appleboy	2016-06-25 07:36:03 +03:00
Mahmoud Zalt	aa0a726945	change enter container commands in the doc `docker-compose run …` to `docker exec -it …`	2016-06-25 07:33:30 +03:00