Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
back-2-95 committed Sep 13, 2023
1 parent 705c6ab commit abae15a
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 15 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ environment with Stonehenge.

If you have PHP and Composer installed on your host (recommended):

```shell
```console
composer create-project druidfi/spell:dev-main yoursite --no-interaction
```

Or using Docker image:

```shell
```console
mkdir yoursite && cd yoursite && \
docker run --rm -it -v $PWD:/app --env COMPOSER_MEMORY_LIMIT=-1 \
druidfi/drupal-web:php-8.2 \
Expand All @@ -51,7 +51,7 @@ Now you need to have Stonehenge up & running.

Start the development environment, build development codebase and install empty site with minimal profile:

```shell
```console
make new
```

Expand All @@ -69,14 +69,14 @@ You can run `make help` to list all available commands for you.

On macOS you need first to install Chromedriver and allow it to execute:

```shell
```console
brew install chromedriver
xattr -d com.apple.quarantine /opt/homebrew/bin/chromedriver
```

Then run the same test scenario as in Github Actions:

```shell
```console
make test
```

Expand Down
6 changes: 3 additions & 3 deletions README.project.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ You need to have these applications installed to operate on all environments:

For the first time (new project):

``` shell
```console
make new
```

And following times to create and start the environment:

``` shell
```console
make fresh
```

Expand All @@ -38,6 +38,6 @@ NOTE: Change these according to the state of your project.

This will log you inside the app container:

``` shell
```console
make shell
```
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"require": {
"php": "^8.2",
"composer-runtime-api": "^2",
"composer/installers": "^2.0",
"cweagans/composer-patches": "^1.7",
"composer/installers": "^2.2.0",
"cweagans/composer-patches": "^1.7.0",
"druidfi/omen": "^0.7.0",
"drupal/core-composer-scaffold": "^10.1",
"drupal/core-recommended": "^10.1",
"drush/drush": "^12.0",
"drush/drush": "^12.2.0",
"oomphinc/composer-installers-extender": "^2.0"
},
"require-dev": {
Expand Down
11 changes: 7 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
services:

app:
hostname: ${DRUPAL_HOSTNAME}
container_name: ${COMPOSE_PROJECT_NAME}-app
hostname: ${DRUPAL_HOSTNAME}
image: druidfi/drupal-web:php-${PHP_VERSION}
volumes:
- .:/app:delegated
- ssh:/tmp/druid_ssh-agent:ro
environment:
APP_ENV: ${APP_ENV:-dev}
DRUSH_OPTIONS_URI: https://${DRUPAL_HOSTNAME}
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -S stonehenge:1025
# Run `export XDEBUG_ENABLE=true` to enable xdebug.
XDEBUG_ENABLE: "${XDEBUG_ENABLE:-false}"
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -S host.docker.internal:1025 -t
SIMPLETEST_BASE_URL: http://app:8080
SIMPLETEST_DB: mysql://drupal:drupal@db:3306/drupal
XDEBUG_ENABLE: ${XDEBUG_ENABLE:-false}
BROWSERTEST_OUTPUT_BASE_URL: https://${DRUPAL_HOSTNAME}
labels:
- "traefik.enable=true"
Expand All @@ -35,6 +34,10 @@ services:
ports:
- 3306

redis:
container_name: ${COMPOSE_PROJECT_NAME}-redis
image: redis:7-alpine

networks:
stonehenge-network:
external: true
Expand Down
15 changes: 15 additions & 0 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<ruleset name="Drupal Standard">
<description>A Drupal coding standard</description>
<config name="drupal_core_version" value="8"/>
<rule ref="./vendor/drupal/coder/coder_sniffer/Drupal"/>
<rule ref="./vendor/drupal/coder/coder_sniffer/DrupalPractice"/>
<arg name="extensions" value="php,module,inc,install,theme,twig,yml"/>
<file>./drush</file>
<file>./public/modules/custom</file>
<file>./public/themes/custom</file>
<exclude-pattern>*/contrib/*</exclude-pattern>
<exclude-pattern>*/dist/*</exclude-pattern>
<exclude-pattern>*/node_modules/*</exclude-pattern>
<exclude-pattern>*/vendor/*</exclude-pattern>
</ruleset>

0 comments on commit abae15a

Please sign in to comment.