Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .docker/data/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Ignore everything in this directory
*
# Except this file
# Except
!.gitignore
!Readme.md
!README.md
7 changes: 5 additions & 2 deletions .docker/data/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@

Please map persistent volumes to this directory on the servers.

If a container needs to persist data between restarts you can map the relevant files in the container to ``docker/data/<container-name>`.
If a container needs to persist data between restarts you can map the relevant files in the container to
`.docker/data/<container-name>`.

## RabbitMQ example
If you are using RabbitMQ running in a container as a message broker you need to configure a persistent volume for RabbitMQs data directory to avoid losing message on container restarts.

If you are using RabbitMQ running in a container as a message broker you need to configure a persistent volume for
RabbitMQs data directory to avoid losing message on container restarts.
x
```yaml
# docker-compose.server.override.yml

Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ on:
jobs:
changelog:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
fetch-depth: 2

Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/composer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,21 @@ env:

on:
pull_request:
paths: &paths
- "composer.json"
- "composer.lock"
- "docker-compose.yml"
push:
branches:
- main
- develop
paths: *paths

jobs:
composer-validate:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Create docker network
run: |
Expand All @@ -52,10 +55,8 @@ jobs:

composer-normalized:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Create docker network
run: |
Expand All @@ -67,14 +68,12 @@ jobs:

composer-audit:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Create docker network
run: |
docker network create frontend

- run: |
docker compose run --rm phpfpm composer audit
docker compose run --rm phpfpm composer audit --locked
8 changes: 5 additions & 3 deletions .github/workflows/javascript.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@ name: JavaScript

on:
pull_request:
paths: &paths
- "**/*.js"
- "docker-compose.yml"
push:
branches:
- main
- develop
paths: *paths

jobs:
javascript-lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/markdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,20 @@ name: Markdown

on:
pull_request:
paths: &paths
- "**/*.md"
push:
branches:
- main
- develop
paths: *paths

jobs:
markdown-lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/php.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,23 @@ env:

on:
pull_request:
paths: &paths
- "**/*.php"
- "composer.json"
- "composer.lock"
- "docker-compose.yml"
push:
branches:
- main
- develop
paths: *paths

jobs:
coding-standards:
name: PHP - Check Coding Standards
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/site.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
name: Check that site can be installed
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
runs-on: ubuntu-latest
steps:
# Install site from our base ref
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
ref: ${{ github.base_ref }}

Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
sudo chmod -Rv a+w web/sites/default || true

# Update site using our updated code.
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
# Keep our local settings (cf.
# https://github.com/actions/checkout?tab=readme-ov-file#usage)
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/styles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,22 @@ name: Styles

on:
pull_request:
paths: &paths
- "**/*.css"
- "**/*.scss"
- "docker-compose.yml"
push:
branches:
- main
- develop
paths: *paths

jobs:
styles-lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/twig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,23 @@ env:

on:
pull_request:
paths: &paths
- "**/*.twig"
- "composer.json"
- "composer.lock"
- "docker-compose.yml"
push:
branches:
- main
- develop
paths: *paths

jobs:
twig-lint:
runs-on: ubuntu-latest
strategy:
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/yaml.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,20 @@ name: YAML

on:
pull_request:
paths: &paths
- "**/*.yml"
- "**/*.yaml"
push:
branches:
- main
- develop
paths: *paths

jobs:
yaml-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6

- name: Create docker network
run: |
Expand Down
11 changes: 11 additions & 0 deletions .prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This file is copied from config/drupal/yaml/.prettierrc.yaml in https://github.com/itk-dev/devops_itkdev-docker.
# Feel free to edit the file, but consider making a pull request if you find a general issue with the file.

# https://prettier.io/docs/configuration
overrides:
# https://taskfile.dev/docs/styleguide
- files:
- "Taskfile.{yml,yaml}"
options:
tabWidth: 2
singleQuote: true
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

- [PR-396](https://github.com/itk-dev/os2loop/pull/396)
Security update
- [PR-395](https://github.com/itk-dev/os2loop/pull/395)
7840: Improved handling of empty step title
- [PR-394](https://github.com/itk-dev/os2loop/pull/394)
Expand Down
Loading
Loading