Skip to content

Commit

Permalink
Fix some issues with Windows Support (#66)
Browse files Browse the repository at this point in the history
* Fix file line ending and network mode for Windows

* Setup gitattributes file to force correct line ending

* All file forced to LF line ending

* Put back host networking for capable operating system + doc

* Remove the old Linux file and improve the README

* Revert some changes
  • Loading branch information
damienalexandre authored Jun 18, 2020
1 parent c335168 commit 83afda5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Force LF line ending (mandatory for Windows)
* text=auto eol=lf
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -518,17 +518,16 @@ services first.

</details>

### Windows support (experimental)
### Docker For Windows support (partial)

<details>

<summary>Read the cookbook</summary>

This starter kit is compatible with Docker for Windows, so you can enjoy native Docker experience on Windows. You will have to keep in mind some differences:

- Composer cache can't be set to the relative home path in `infrastructure/docker/docker-compose.builder.yml`: remove `- "~/.composer/cache:/home/app/.composer/cache"`;
- You will be prompted to run the env vars manually if you use PowerShell.

- You will be prompted to run the env vars manually if you use PowerShell;
- As pty in invoke does not works on Windows, **the builder is not really usable**... See https://github.com/pyinvoke/invoke/issues/561 for more information.
</details>

### How to access a container via a custom hostname from another container
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
build: services/router
volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
network_mode: "host"
network_mode: host

frontend:
build: services/frontend
Expand Down
2 changes: 1 addition & 1 deletion invoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def __extract_runtime_configuration(config):
print('$Env:PROJECT_NAME="%s"' % config['project_name'])
print('$Env:PROJECT_DIRECTORY="%s"' % config['project_directory'])
print('$Env:PROJECT_ROOT_DOMAIN="%s"' % config['root_domain'])
print('$Env:PROJECT_DOMAINS="%s"' % domains)
print("$Env:PROJECT_DOMAINS='%s'" % domains)
print('$Env:COMPOSER_CACHE_DIR="%s"' % config['composer_cache_dir'])
sys.exit(1)

Expand Down

0 comments on commit 83afda5

Please sign in to comment.