Skip to content

Commit 86c1f4f

Browse files
Merge pull request #66 from deniskorbakov/add-lint-hadolint
Add lint hadolint
2 parents 9031978 + 5866088 commit 86c1f4f

File tree

5 files changed

+17
-5
lines changed

5 files changed

+17
-5
lines changed

.docker/php/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dunglas/frankenphp AS base
1+
FROM dunglas/frankenphp:1.9.1-php8.4.15-trixie AS base
22

33
RUN apt-get update \
44
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -8,7 +8,9 @@ RUN apt-get update \
88
libpq-dev \
99
aspell \
1010
aspell-en \
11-
supervisor
11+
supervisor \
12+
&& apt-get clean \
13+
&& rm -rf /var/lib/apt/lists/*
1214

1315
RUN install-php-extensions \
1416
gd \

.github/workflows/deploy.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v6
14+
- uses: hadolint/hadolint-action@v3.1.0
15+
with:
16+
dockerfile: .docker/php/Dockerfile
17+
config: ./hadolint.yaml
18+
recursive: true
1419

1520
- name: Setup PHP with Xdebug
1621
uses: shivammathur/setup-php@v2

makefile renamed to Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,6 @@ restart:
8181
@docker restart php.${APP_NAMESPACE}
8282
expand-server:
8383
ansible-playbook -i ansible/inventory.ini ansible/playbooks/expand_environment.yml
84-
85-
84+
docker-lint:
85+
docker run --rm -i -v ./hadolint.yaml:/.config/hadolint.yaml hadolint/hadolint < .docker/php/Dockerfile
86+
docker run --rm -i -v ./hadolint.yaml:/.config/hadolint.yaml hadolint/hadolint < .docker/centrifugo/Dockerfile

hadolint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
ignored:
3+
- DL3008

peck.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
"websocket",
1616
"favicon",
1717
"nginx",
18-
"ansible"
18+
"ansible",
19+
"hadolint"
1920
],
2021
"paths": [
2122
"/public/vendor",

0 commit comments

Comments
 (0)