From 83afda59571e0b3aac08d44800228005cea8cbcb Mon Sep 17 00:00:00 2001 From: Damien Alexandre Date: Thu, 18 Jun 2020 19:38:29 +0200 Subject: [PATCH] Fix some issues with Windows Support (#66) * 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 --- .gitattributes | 2 ++ README.md | 7 +++---- infrastructure/docker/docker-compose.yml | 2 +- invoke.py | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1823cf6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Force LF line ending (mandatory for Windows) +* text=auto eol=lf diff --git a/README.md b/README.md index ca6dc23..069b4b8 100644 --- a/README.md +++ b/README.md @@ -518,7 +518,7 @@ services first. -### Windows support (experimental) +### Docker For Windows support (partial)
@@ -526,9 +526,8 @@ services first. 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.
### How to access a container via a custom hostname from another container diff --git a/infrastructure/docker/docker-compose.yml b/infrastructure/docker/docker-compose.yml index 49a2661..2cf5c9c 100644 --- a/infrastructure/docker/docker-compose.yml +++ b/infrastructure/docker/docker-compose.yml @@ -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 diff --git a/invoke.py b/invoke.py index 304b65c..47834fb 100644 --- a/invoke.py +++ b/invoke.py @@ -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)