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

Pin composer at version 1 until such time as the install works with c… #10

Merged
merged 6 commits into from
Nov 1, 2020
Merged

Pin composer at version 1 until such time as the install works with c… #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f01f108
Pin composer at version 1 until such time as the install works with c…
finnlewis Oct 29, 2020
ec00a4d
Use Composer version installed in Docker container to install site. #9
stephen-cox Oct 30, 2020
67ddca2
Create site install directory before installing with Composer. #9
stephen-cox Oct 30, 2020
c5abad5
Fixing issues with site install in GitHub Actions. #9
stephen-cox Oct 30, 2020
40f0689
Fixing issues with site install in GitHub Actions. #9
stephen-cox Oct 30, 2020
7872306
Added --keep-vcs flag to composer create-project command. #9
stephen-cox Oct 30, 2020
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
8 changes: 5 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,14 @@ 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 root -t drupal bash -c "mkdir -p /var/www/html && chown docker:docker /var/www/html"
docker exec -u docker -t drupal bash -c "/usr/local/bin/composer create-project --keep-vcs --stability dev localgovdrupal/localgov-project /var/www/html"

- name: Run tests
run: ./run-tests.sh
shell: bash
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ COPY config/php/docker.ini /etc/php/7.2/conf.d/docker.ini
RUN ln -s /etc/php/7.2/conf.d/docker.ini /etc/php/7.2/apache2/conf.d/90-docker.ini

# Install Composer,
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --version=1.10.16

EXPOSE 80

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```