From 53e1091d2b93dcb1bd1ec8fd71c22bc55b56c2cf Mon Sep 17 00:00:00 2001 From: FirePrawn Date: Thu, 11 Apr 2019 16:05:46 +0200 Subject: [PATCH 1/3] Few lines added for Windows configuration --- docker/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/README.md b/docker/README.md index f631d24e..43a9cbcb 100644 --- a/docker/README.md +++ b/docker/README.md @@ -8,6 +8,7 @@ Miaou development environment using Docker ### Linux - [Docker and Docker Compose](https://docs.docker.com/engine/installation/linux/) + - Docker needs Hyper-V activated and purpose to activate it itself (restart needed). Beware : activating Hyper-V disables any other virtualisation softwares. ### Windows @@ -39,6 +40,10 @@ Miaou development environment using Docker 4. Prebuild Miaou: + Windows configuration : + - When cloning miaou repository, make sure you keep LF and not CRLF or it will generate end of files errors during the prebuild + - Open PowerShell, you must be at the root directory of Miaou which contains the DockerFile + ```bash docker-compose up -d ``` From b68f05847d44153158a57340d2e41d7e58d1c14e Mon Sep 17 00:00:00 2001 From: FirePrawn Date: Thu, 11 Apr 2019 16:21:27 +0200 Subject: [PATCH 2/3] Display adjustements --- docker/README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/README.md b/docker/README.md index 43a9cbcb..d987653f 100644 --- a/docker/README.md +++ b/docker/README.md @@ -40,9 +40,10 @@ Miaou development environment using Docker 4. Prebuild Miaou: - Windows configuration : - - When cloning miaou repository, make sure you keep LF and not CRLF or it will generate end of files errors during the prebuild - - Open PowerShell, you must be at the root directory of Miaou which contains the DockerFile + Windows configuration : + + - When cloning miaou repository, make sure you keep LF and not CRLF or it will generate end of files errors during the prebuild + - Open PowerShell, you must be at the root directory of Miaou which contains the DockerFile ```bash docker-compose up -d From b4a540c4f23e1621ca66f597c92df6ca7011fc7c Mon Sep 17 00:00:00 2001 From: FirePrawn Date: Thu, 11 Apr 2019 16:26:04 +0200 Subject: [PATCH 3/3] And another correction... --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index d987653f..29c38612 100644 --- a/docker/README.md +++ b/docker/README.md @@ -8,11 +8,11 @@ Miaou development environment using Docker ### Linux - [Docker and Docker Compose](https://docs.docker.com/engine/installation/linux/) - - Docker needs Hyper-V activated and purpose to activate it itself (restart needed). Beware : activating Hyper-V disables any other virtualisation softwares. ### Windows - [Docker and Docker Compose](https://docs.docker.com/engine/installation/windows/) + - Docker needs Hyper-V activated and purpose to activate it itself (restart needed). Beware : activating Hyper-V disables any other virtualisation softwares. ### Mac OS X