Merge pull request #403 from darthrevan13/patch-1

Fix for mariadb local path
update the workspace container version
2016-11-03 23:02:16 +08:00 · 2016-11-03 09:50:21 -04:00 · 2016-11-03 09:50:10 -04:00 · 2016-11-03 15:45:59 +02:00 · 2016-11-02 13:43:45 +08:00
4 changed files with 10 additions and 6 deletions
--- a/README-zh.md
+++ b/README-zh.md
@ -7,9 +7,7 @@
 LaraDock能够帮你在**Docker**上快速搭建**Laravel**应用。
 <br>
 就像Laravel Homestead一样，但是Docker替换了Vagrant。
->先在Docker上使用LaraDock，然后再学习它们。
-
-![](https://s31.postimg.org/nbettdki3/lara_dock_poster_new.jpg)
+> 先在使用 LaraDock，然后再学习它们。

 <br>
 ## 目录
--- a/README.md
+++ b/README.md
@ -287,7 +287,13 @@ git clone https://github.com/LaraDock/laradock.git
 ```
 Do the same for each project `project2.conf`, `project3.conf`,...

-6 - Create your project Databases **To Be Continue..**
+6 - Add the domains to the **hosts** files.
+
+```
+127.0.0.1  project1.dev
+```
+
+7 - Create your project Databases. Right now you have to do it manually by entering your DB container, until we automate it soon.



--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -128,7 +128,7 @@ services:
    mariadb:
        build: ./mariadb
        volumes:
-            - mariadb
+            - mysql:/var/lib/mysql
        ports:
            - "3306:3306"
        environment:
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@ -10,7 +10,7 @@
 #    https://hub.docker.com/r/laradock/workspace/tags/
 #

-FROM laradock/workspace:1.1
+FROM laradock/workspace:1.2

 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
Author	SHA1	Message	Date
Bo-Yi Wu	3f157a3277	Merge pull request #403 from darthrevan13/patch-1 Fix for mariadb local path	2016-11-03 23:02:16 +08:00
Mahmoud Zalt	f732bb283b	update the workspace container version	2016-11-03 09:50:21 -04:00
Mahmoud Zalt	ca4aeada08	add missing step to the docs	2016-11-03 09:50:10 -04:00
darthrevan13	3d54d68aa1	Fix for mariadb local path When running docker-compose with mariadb the following message will appear: ERROR: for mariadb Cannot create container for service mariadb: Invalid volume spec "mariadb": Invalid volume destination path: 'mariadb' mount path must be absolute. ERROR: Encountered errors while bringing up the project. This commit fixes the issue.	2016-11-03 15:45:59 +02:00
Bo-Yi Wu	a0153810c6	remove laradock logo on zh document. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2016-11-02 13:43:45 +08:00