Skip to content

Commit ca2a4cf

Browse files
authored
Merge pull request #51 from wayofdev/feat/changes
2 parents d2594d2 + f3a3ce3 commit ca2a4cf

File tree

8 files changed

+24
-38
lines changed

8 files changed

+24
-38
lines changed

.dive-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
---
2+
13
rules:
24
# If the efficiency is measured below X%, mark as failed.
35
# Expressed as a ratio between 0-1.
@@ -11,3 +13,5 @@ rules:
1113
# Note: the base image layer is NOT included in the total image size.
1214
# Expressed as a ratio between 0-1; fails if the threshold is met or crossed.
1315
highestUserWastedPercent: 0.20
16+
17+
...

.github/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
"type: documentation":
77
- changed-files:
8-
- any-glob-to-any-file: [ 'assets/**/*', '.github/*.yml', './*.md' ]
8+
- any-glob-to-any-file: ['assets/**/*', '.github/*.yml', './*.md']
99

1010
"type: maintenance":
1111
- changed-files:
12-
- any-glob-to-any-file: [ '.github/workflows/*' ]
12+
- any-glob-to-any-file: ['.github/workflows/*']
1313

1414
...

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: "${{ github.workflow }}-${{ github.ref }}"
55
cancel-in-progress: true
66

77
on: # yamllint disable-line rule:truthy
@@ -76,7 +76,6 @@ jobs:
7676
- name: ⚙️ Rename meta bake definition file
7777
run: |
7878
mv "${{ steps.meta.outputs.bake-file }}" "/tmp/bake-meta-${{ env.PLATFORM_CACHE_TAG }}.json"
79-
cat "/tmp/bake-meta-${{ env.PLATFORM_CACHE_TAG }}.json"
8079
8180
- name: 📤 Upload meta bake definition
8281
uses: actions/upload-artifact@v4
@@ -114,10 +113,6 @@ jobs:
114113
*.cache-to=type=gha,scope=build-${{ env.PLATFORM_CACHE_TAG }}
115114
*.output=type=image,"name=${{ env.DOCKER_NAMESPACE }},${{ env.GHCR_NAMESPACE }}",push-by-digest=true,name-canonical=true,push=true
116115
117-
- name: 🔍 Debug Bake Metadata Output
118-
run: |
119-
echo /tmp/bake-meta-${{ env.PLATFORM_CACHE_TAG }}.json
120-
121116
- name: 📥 Export digest
122117
run: |
123118
mkdir -p /tmp/digests

.github/workflows/shellcheck.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
---
22

3+
concurrency:
4+
group: "${{ github.workflow }}-${{ github.ref }}"
5+
cancel-in-progress: true
6+
37
on: # yamllint disable-line rule:truthy
48
pull_request:
59

.github/workflows/test.yml

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

33
concurrency:
4-
group: ${{ github.workflow }}-${{ github.ref }}
4+
group: "${{ github.workflow }}-${{ github.ref }}"
55
cancel-in-progress: true
66

7-
on:
7+
on: # yamllint disable-line rule:truthy
88
pull_request:
99
paths-ignore:
1010
- '**.md'

.hadolint.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
13
trustedRegistries:
24
- docker.io
35
- "*.gcr.io"
6+
7+
...

.yamllint

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ rules:
4747
require-starting-space: true
4848
min-spaces-from-content: 1
4949

50-
line-length:
51-
max: 180
52-
level: warning
50+
line-length: disable
5351

5452
yaml-files:
5553
- "*.yaml"

README.md

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,10 @@ Enabled extensions by default:
3737
| [bcmath](https://www.php.net/manual/en/book.bc.php) | For arbitrary precision mathematics | native |
3838
| [exif](https://www.php.net/manual/en/book.exif.php) | Exchangeable image information | native |
3939
| [gd](https://www.php.net/manual/en/book.image.php) | Image processing and manipulation library | native |
40-
| [soap](https://www.php.net/manual/en/book.soap.php) | SOAP (Simple Object Access Protocol) functions | native |
4140
| [redis](https://pecl.php.net/package/redis) | Functions for interfacing with Redis | pecl |
4241
| [memcached](https://pecl.php.net/package/memcached) | Functions for interfacing with Memcached | pecl |
4342
| [decimal](https://pecl.php.net/package/decimal) | Arbitrary precision floating-point decimal | pecl |
44-
| [imagick](https://pecl.php.net/package/imagick) | ImageMagick library for image manipulation | pecl |
45-
| [rdkafka](https://pecl.php.net/package/rdkafka) | Kafka client library for PHP | pecl |
4643
| [amqp](https://pecl.php.net/package/amqp) | Advanced Message Queuing Protocol (AMQP) library | pecl |
47-
| [protobuf](https://pecl.php.net/package/protobuf) | Protocol Buffers serialization format library | pecl |
4844
| [yaml](https://pecl.php.net/package/yaml) | YAML (YAML Ain't Markup Language) library | pecl |
4945

5046
<br>
@@ -84,18 +80,13 @@ ext_native_enabled:
8480
- bcmath
8581
- exif
8682
- gd
87-
- soap
8883

8984
ext_pecl_enabled:
9085
- redis
9186
- memcached
9287
- decimal
93-
- imagick
94-
- rdkafka
9588
- amqp
96-
- protobuf
9789
- yaml
98-
9990
```
10091
10192
<br>
@@ -144,12 +135,6 @@ $ make
144135
Building all images:
145136

146137
```bash
147-
$ make build IMAGE_TEMPLATE="7.4-cli-alpine"
148-
$ make build IMAGE_TEMPLATE="7.4-fpm-alpine"
149-
$ make build IMAGE_TEMPLATE="7.4-supervisord-alpine"
150-
$ make build IMAGE_TEMPLATE="8.0-cli-alpine"
151-
$ make build IMAGE_TEMPLATE="8.0-fpm-alpine"
152-
$ make build IMAGE_TEMPLATE="8.0-supervisord-alpine"
153138
$ make build IMAGE_TEMPLATE="8.1-cli-alpine"
154139
$ make build IMAGE_TEMPLATE="8.1-fpm-alpine"
155140
$ make build IMAGE_TEMPLATE="8.1-supervisord-alpine"
@@ -176,12 +161,6 @@ $ make test
176161
To test all images:
177162

178163
```bash
179-
$ make test IMAGE_TEMPLATE="7.4-cli-alpine"
180-
$ make test IMAGE_TEMPLATE="7.4-fpm-alpine"
181-
$ make test IMAGE_TEMPLATE="7.4-supervisord-alpine"
182-
$ make test IMAGE_TEMPLATE="8.0-cli-alpine"
183-
$ make test IMAGE_TEMPLATE="8.0-fpm-alpine"
184-
$ make test IMAGE_TEMPLATE="8.0-supervisord-alpine"
185164
$ make test IMAGE_TEMPLATE="8.1-cli-alpine"
186165
$ make test IMAGE_TEMPLATE="8.1-fpm-alpine"
187166
$ make test IMAGE_TEMPLATE="8.1-supervisord-alpine"
@@ -215,6 +194,12 @@ Run ansible-lint to validate ansible project files:
215194
$ make lint-ansible
216195
```
217196

197+
Run dive command to analyze image:
198+
199+
```bash
200+
$ make analyze
201+
```
202+
218203
<br>
219204

220205
## 🤝 License
@@ -233,8 +218,4 @@ This repository was created in **2022** by [lotyp / wayofdev](https://github.com
233218

234219
<img align="left" src="https://img.shields.io/github/contributors-anon/wayofdev/docker-php-base?style=for-the-badge" alt="Contributors"/>
235220

236-
<a href="https://github.com/wayofdev/docker-php-base/graphs/contributors">
237-
<img src="https://opencollective.com/wod/contributors.svg?width=890&button=false" alt="OpenCollective Contributors">
238-
</a>
239-
240221
<br>

0 commit comments

Comments
 (0)