From ec00a4df7750e46b7d59774fca557feea09f2799 Mon Sep 17 00:00:00 2001 From: Stephen Cox Date: Fri, 30 Oct 2020 14:49:41 +0000 Subject: [PATCH] Use Composer version installed in Docker container to install site. #9 --- .github/workflows/test.yml | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d425430..9045417 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,12 +14,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Create LocalGovDrupal project - run: composer create-project --stability dev localgovdrupal/localgov-project html - - name: Start Docker environment run: docker-compose up -d + - name: Create LocalGov Drupal project + run: docker exec -u docker -t drupal /usr/local/bin/composer create-project --stability dev localgovdrupal/localgov-project /var/www/html + - name: Run tests run: ./run-tests.sh shell: bash diff --git a/README.md b/README.md index 35cc06a..fffd5bb 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Something like: ```bash git clone git@github.com:localgovdrupal/drupal-container.git localgovdrupal-testing cd localgovdrupal-testing -composer create-project --stability dev localgovdrupal/localgov-project html docker-compose up -d +docker exec -u docker -t drupal /usr/local/bin/composer create-project --stability dev localgovdrupal/localgov-project /var/www/html ./run-tests.sh docker-compose stop ```