Skip to content

Commit a953ba1

Browse files
authored
Merge pull request #396 from itk-dev/feature/security-update
Security update
2 parents 0004221 + 2655089 commit a953ba1

18 files changed

Lines changed: 746 additions & 685 deletions

.docker/data/.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Ignore everything in this directory
22
*
3-
# Except this file
3+
# Except
44
!.gitignore
5-
!Readme.md
5+
!README.md

.docker/data/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22

33
Please map persistent volumes to this directory on the servers.
44

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

78
## RabbitMQ example
8-
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.
99

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

.github/workflows/changelog.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ on:
1414
jobs:
1515
changelog:
1616
runs-on: ubuntu-latest
17-
strategy:
18-
fail-fast: false
1917
steps:
2018
- name: Checkout
21-
uses: actions/checkout@v5
19+
uses: actions/checkout@v6
2220
with:
2321
fetch-depth: 2
2422

.github/workflows/composer.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,21 @@ env:
3030

3131
on:
3232
pull_request:
33+
paths: &paths
34+
- "composer.json"
35+
- "composer.lock"
36+
- "docker-compose.yml"
3337
push:
3438
branches:
3539
- main
3640
- develop
41+
paths: *paths
3742

3843
jobs:
3944
composer-validate:
4045
runs-on: ubuntu-latest
41-
strategy:
42-
fail-fast: false
4346
steps:
44-
- uses: actions/checkout@v5
47+
- uses: actions/checkout@v6
4548

4649
- name: Create docker network
4750
run: |
@@ -52,10 +55,8 @@ jobs:
5255
5356
composer-normalized:
5457
runs-on: ubuntu-latest
55-
strategy:
56-
fail-fast: false
5758
steps:
58-
- uses: actions/checkout@v5
59+
- uses: actions/checkout@v6
5960

6061
- name: Create docker network
6162
run: |
@@ -67,14 +68,12 @@ jobs:
6768
6869
composer-audit:
6970
runs-on: ubuntu-latest
70-
strategy:
71-
fail-fast: false
7271
steps:
73-
- uses: actions/checkout@v5
72+
- uses: actions/checkout@v6
7473

7574
- name: Create docker network
7675
run: |
7776
docker network create frontend
7877
7978
- run: |
80-
docker compose run --rm phpfpm composer audit
79+
docker compose run --rm phpfpm composer audit --locked

.github/workflows/javascript.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@ name: JavaScript
1515

1616
on:
1717
pull_request:
18+
paths: &paths
19+
- "**/*.js"
20+
- "docker-compose.yml"
1821
push:
1922
branches:
2023
- main
2124
- develop
25+
paths: *paths
2226

2327
jobs:
2428
javascript-lint:
2529
runs-on: ubuntu-latest
26-
strategy:
27-
fail-fast: false
2830
steps:
2931
- name: Checkout
30-
uses: actions/checkout@v5
32+
uses: actions/checkout@v6
3133

3234
- name: Create docker network
3335
run: |

.github/workflows/markdown.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,20 @@ name: Markdown
2222

2323
on:
2424
pull_request:
25+
paths: &paths
26+
- "**/*.md"
2527
push:
2628
branches:
2729
- main
2830
- develop
31+
paths: *paths
2932

3033
jobs:
3134
markdown-lint:
3235
runs-on: ubuntu-latest
33-
strategy:
34-
fail-fast: false
3536
steps:
3637
- name: Checkout
37-
uses: actions/checkout@v5
38+
uses: actions/checkout@v6
3839

3940
- name: Create docker network
4041
run: |

.github/workflows/php.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,23 @@ env:
3838

3939
on:
4040
pull_request:
41+
paths: &paths
42+
- "**/*.php"
43+
- "composer.json"
44+
- "composer.lock"
45+
- "docker-compose.yml"
4146
push:
4247
branches:
4348
- main
4449
- develop
50+
paths: *paths
4551

4652
jobs:
4753
coding-standards:
4854
name: PHP - Check Coding Standards
4955
runs-on: ubuntu-latest
5056
steps:
51-
- uses: actions/checkout@v5
57+
- uses: actions/checkout@v6
5258

5359
- name: Create docker network
5460
run: |

.github/workflows/site.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
name: Check that site can be installed
3434
runs-on: ubuntu-latest
3535
steps:
36-
- uses: actions/checkout@v5
36+
- uses: actions/checkout@v6
3737

3838
- name: Create docker network
3939
run: |
@@ -92,7 +92,7 @@ jobs:
9292
runs-on: ubuntu-latest
9393
steps:
9494
# Install site from our base ref
95-
- uses: actions/checkout@v5
95+
- uses: actions/checkout@v6
9696
with:
9797
ref: ${{ github.base_ref }}
9898

@@ -130,7 +130,7 @@ jobs:
130130
sudo chmod -Rv a+w web/sites/default || true
131131
132132
# Update site using our updated code.
133-
- uses: actions/checkout@v5
133+
- uses: actions/checkout@v6
134134
with:
135135
# Keep our local settings (cf.
136136
# https://github.com/actions/checkout?tab=readme-ov-file#usage)

.github/workflows/styles.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,22 @@ name: Styles
1515

1616
on:
1717
pull_request:
18+
paths: &paths
19+
- "**/*.css"
20+
- "**/*.scss"
21+
- "docker-compose.yml"
1822
push:
1923
branches:
2024
- main
2125
- develop
26+
paths: *paths
2227

2328
jobs:
2429
styles-lint:
2530
runs-on: ubuntu-latest
26-
strategy:
27-
fail-fast: false
2831
steps:
2932
- name: Checkout
30-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3134

3235
- name: Create docker network
3336
run: |

.github/workflows/twig.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,23 @@ env:
2828

2929
on:
3030
pull_request:
31+
paths: &paths
32+
- "**/*.twig"
33+
- "composer.json"
34+
- "composer.lock"
35+
- "docker-compose.yml"
3136
push:
3237
branches:
3338
- main
3439
- develop
40+
paths: *paths
3541

3642
jobs:
3743
twig-lint:
3844
runs-on: ubuntu-latest
39-
strategy:
40-
fail-fast: false
4145
steps:
4246
- name: Checkout
43-
uses: actions/checkout@v5
47+
uses: actions/checkout@v6
4448

4549
- name: Create docker network
4650
run: |

0 commit comments

Comments
 (0)