From a9e116ede959fa12eb559d538388e30f4611d09b Mon Sep 17 00:00:00 2001 From: Alfred <ahamidullin@iseck.com> Date: Fri, 22 Feb 2019 20:35:15 +0500 Subject: [PATCH 1/5] Without chmod +x install composer fails. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ff8edc0..3864d60 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ pseudoxml: install: vendor composer.phar: - docker/install-composer.sh + chmod +x docker/install-composer.sh && docker/install-composer.sh vendor: composer.phar php composer.phar install From e4fd39eba31ab8a46c27eb527473a8c9006af4c1 Mon Sep 17 00:00:00 2001 From: Alfred <ahamidullin@iseck.com> Date: Fri, 22 Feb 2019 21:13:29 +0500 Subject: [PATCH 2/5] Fix docker installation link. Add Play With Docker link. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cf52c8c..b763d56 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,9 @@ $ ./vendor/bin/phpunit ## using Docker (optional) -You can optionally run tests using [Docker for Mac](https://www.docker.com/docker-mac) or [Windows](https://www.docker.com/docker-windows) or native one for [Linux](https://www.docker.com/docker-debian). +You can optionally run tests using [Docker for Mac, Windows or Linux](https://docs.docker.com/compose/install/). +Or use Play With Docker [https://labs.play-with-docker.com] and run the tests right inside a browser. + Just run: ```bash From 38c63737979aa2cc541ef9fcb84942c4171aa0bc Mon Sep 17 00:00:00 2001 From: Alfred <ahamidullin@iseck.com> Date: Mon, 25 Feb 2019 17:57:33 +0500 Subject: [PATCH 3/5] Remove PWD link. --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index b763d56..97de0a9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ $ ./vendor/bin/phpunit ## using Docker (optional) You can optionally run tests using [Docker for Mac, Windows or Linux](https://docs.docker.com/compose/install/). -Or use Play With Docker [https://labs.play-with-docker.com] and run the tests right inside a browser. Just run: From 87e247f1cee76897521dfc072f3de6ab2a844a9f Mon Sep 17 00:00:00 2001 From: Alfred <ahamidullin@iseck.com> Date: Mon, 25 Feb 2019 18:08:54 +0500 Subject: [PATCH 4/5] Remove chmod command, add git chmod way `git update-index --chmod=+x install-composer.sh` --- Makefile | 2 +- docker/install-composer.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 docker/install-composer.sh diff --git a/Makefile b/Makefile index 3864d60..ff8edc0 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ pseudoxml: install: vendor composer.phar: - chmod +x docker/install-composer.sh && docker/install-composer.sh + docker/install-composer.sh vendor: composer.phar php composer.phar install diff --git a/docker/install-composer.sh b/docker/install-composer.sh old mode 100644 new mode 100755 From b4065c10bfdc059e3fec5df45494aa58c844adc0 Mon Sep 17 00:00:00 2001 From: Alfred <ahamidullin@iseck.com> Date: Mon, 25 Feb 2019 18:51:26 +0500 Subject: [PATCH 5/5] Fix composer install. php is a service name in docker-compose, the command to run is `php composer.phar install` --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 97de0a9..8899aa4 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ $ docker-compose up To only install the dependencies, use `docker-compose` like this: ```bash -$ docker-compose run composer install +$ docker-compose run php php composer.phar install ``` ## Patterns