Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Few lines added for Windows configuration #95

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Few lines added for Windows configuration #95

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53e1091
Few lines added for Windows configuration
FirePrawn Apr 11, 2019
b68f058
Display adjustements
FirePrawn Apr 11, 2019
b4a540c
And another correction...
FirePrawn Apr 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Miaou development environment using Docker
### 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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be deleted, this is a Docker prerequisite.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not a Docker prerequisite if you don't use Docker for Windows, but indeed 99.99% of docker users will use it, so the whole Requirements section seems overkill to me (or explicitly mention that we assume they will use Docker for Windows for Windows and Docker for Mac for Mac)... The Linux section remains useful only to tell users to install docker-compose which is not a default when installing docker on linux


### Mac OS X

Expand Down Expand Up @@ -39,6 +40,11 @@ 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
```
Expand Down