Merge pull request #151 from computerfr33k/issue-147

Fix Memcached extension not installing
Update Dockerfile-70
2016-07-18 23:55:18 +03:00 · 2016-07-16 13:07:56 -05:00 · 2016-07-14 15:29:54 +03:00 · 2016-07-14 09:56:05 +08:00 · 2016-07-14 04:28:12 +03:00 · 2016-07-14 04:27:45 +03:00
4 changed files with 28 additions and 21 deletions
--- a/README.md
+++ b/README.md
@ -7,6 +7,7 @@ LaraDock helps you run your **Laravel** App on **Docker** real quick.
 <br>
 It's like Laravel Homestead but for Docker instead of Vagrant.

+>With LaraDock, use Docker first and learn about it later.

 ![](http://s18.postimg.org/fhykchl09/new_laradock_cover.png)

@ -49,7 +50,7 @@ It's like Laravel Homestead but for Docker instead of Vagrant.
 		- [Run a Docker Virtual Host](#Run-Docker-Virtual-Host)
 		- [Find your Docker IP Address](#Find-Docker-IP-Address)
 		- [Use custom Domain](#Use-custom-Domain)
-		- [Install-Prestissimo](#Install-Prestissimo)
+		- [Install Prestissimo](#Install-Prestissimo)
 		- [Debugging](#debugging)
 - [Help & Questions](#Help)

@ -99,7 +100,7 @@ docker-compose up  nginx mysql redis
 - Memcached
 - Beanstalkd
 - Beanstalkd Console
- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano and cURL)
+- Workspace (contains: Composer, PHP7-CLI, Laravel Installer, Git, Node, Gulp, Bower, SQLite,  Vim, Nano, cURL and much more)
 - Data *(Databases Data Container)*
 - Application *(Application Code Container)*

@ -113,7 +114,7 @@ docker-compose up  nginx mysql redis
 <a name="what-is-docker"></a>
 ### What is Docker?

-[Docker](https://www.docker.com)  is an open-source project that automates the deployment of applications inside software containers, by providing an additional layer of abstraction and automation of [operating-system-level virtualization](https://en.wikipedia.org/wiki/Operating-system-level_virtualization) on Linux, Mac OS and Windows.
+[Docker](https://www.docker.com) is an open-source project that automates the deployment of applications inside software containers, by providing an additional layer of abstraction and automation of [operating-system-level virtualization](https://en.wikipedia.org/wiki/Operating-system-level_virtualization) on Linux, Mac OS and Windows.

 <a name="what-is-laravel"></a>
 ### What is Laravel?
@ -140,26 +141,21 @@ LaraDock and [Homestead](https://laravel.com/docs/master/homestead) both gives y

 - Homestead is a tool that controls Vagrant for you (using Homestead special commands). And Vagrant manages your Virtual Machine.

- LaraDock is a tool that controls Docker for you (using Docker Compose official commands). And Docker manages you Virtual Containers.
+- LaraDock is a tool that controls Docker for you (using Docker & Docker Compose official commands). And Docker manages your Virtual Containers.

-Running a virtual Container is much faster than running a full virtual Machine.
-<br>Thus **LaraDock is much faster than Homestead**.
+Running a virtual Container is much faster than running a full virtual Machine. Thus **LaraDock is much faster than Homestead**.



 <a name="Requirements"></a>
 ## Requirements

-| Linux                                                                                   | Windows & MAC                                           |
-|-----------------------------------------------------------------------------------------|---------------------------------------------------------|
-|                 [Laravel](https://laravel.com/docs/master/installation)                 | [Laravel](https://laravel.com/docs/master/installation) |
-|                           [Git](https://git-scm.com/downloads)                          |           [Git](https://git-scm.com/downloads)          |
-| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) |     [Docker Toolbox](https://www.docker.com/toolbox)    |
-|                [Docker Compose](https://docs.docker.com/compose/install)                |                                                         |
-
-
-
-
+| Linux                                                                          | Windows & MAC                                                                                 |
+|--------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------|
+| [Laravel](https://laravel.com/docs/master/installation)                        | [Laravel](https://laravel.com/docs/master/installation)                                       |
+| [Git](https://git-scm.com/downloads)                                           | [Git](https://git-scm.com/downloads)                                                          |
+| [Docker Engine](https://docs.docker.com/engine/installation/linux/ubuntulinux) | [Docker Toolbox](https://www.docker.com/toolbox) OR [Native Docker](https://beta.docker.com/) |
+| [Docker Compose](https://docs.docker.com/compose/install)                      |                                                                                               |

 <a name="Demo"></a>
 ## Demo Video
--- a/php-fpm/Dockerfile-55
+++ b/php-fpm/Dockerfile-55
@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y \
    libpq-dev \
    libmemcached-dev \
    curl \
+    libjpeg-dev \
    libpng12-dev \
    libfreetype6-dev \
    libssl-dev \
@ -25,6 +26,7 @@ RUN pecl install mongodb
 # configure gd library
 RUN docker-php-ext-configure gd \
    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
    --with-freetype-dir=/usr/include/freetype2

 # Install extensions using the helper script provided by the base image
--- a/php-fpm/Dockerfile-56
+++ b/php-fpm/Dockerfile-56
@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y \
    libpq-dev \
    libmemcached-dev \
    curl \
+    libjpeg-dev \
    libpng12-dev \
    libfreetype6-dev \
    libssl-dev \
@ -25,6 +26,7 @@ RUN pecl install mongodb
 # configure gd library
 RUN docker-php-ext-configure gd \
    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
    --with-freetype-dir=/usr/include/freetype2

 # Install extensions using the helper script provided by the base image
--- a/php-fpm/Dockerfile-70
+++ b/php-fpm/Dockerfile-70
@ -37,11 +37,18 @@ RUN docker-php-ext-install \

 # Install Memcached for php 7
 RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
-    && mkdir -p /usr/src/php/ext/memcached \
-    && tar -C /usr/src/php/ext/memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
-    && docker-php-ext-configure memcached \
-    && docker-php-ext-install memcached \
-    && rm /tmp/memcached.tar.gz
+    && mkdir -p memcached \
+    && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
+    && ( \
+        cd memcached \
+        && phpize \
+        && ./configure \
+        && make -j$(nproc) \
+        && make install \
+    ) \
+    && rm -r memcached \
+    && rm /tmp/memcached.tar.gz \
+    && docker-php-ext-enable memcached

 # Install xdebug
 RUN pecl install xdebug \
Author	SHA1	Message	Date
Mahmoud Zalt	fc303dee08	Merge pull request #151 from computerfr33k/issue-147 Fix Memcached extension not installing	2016-07-18 23:55:18 +03:00
Eric Pfeiffer	d75a43c615	Update Dockerfile-70 fixes memcached extension not installing	2016-07-16 13:07:56 -05:00
Mahmoud Zalt	06337e6024	Merge pull request #144 from appleboy/patch-7 #140 update php 5.5 and 5.6	2016-07-14 15:29:54 +03:00
Bo-Yi Wu	16b82d066e	#140 update php 5.5 and 5.6 Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2016-07-14 09:56:05 +08:00
Mahmoud Zalt	074deec781	Merge branch 'master' of https://github.com/LaraDock/laradock * 'master' of https://github.com/LaraDock/laradock: fix the volumes mapping	2016-07-14 04:28:12 +03:00
Mahmoud Zalt	2d382b683a	general updates to the readme	2016-07-14 04:27:45 +03:00