Skip to content

Commit 63aeaf7

Browse files
lotyplotyp
committed
feat!: updating codebase
1 parent 7a4df44 commit 63aeaf7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+545
-115
lines changed

‎.cz.toml

-5
This file was deleted.

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ trim_trailing_whitespace = true
1010

1111
[*.{yml,yaml}]
1212
indent_size = 2
13+
14+
[*.yaml.j2]
15+
indent_size = 2

‎.github/dependabot.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@
22

33
version: 2
44
updates:
5-
# Maintain dependencies for GitHub Actions
65
- package-ecosystem: "github-actions"
76
directory: "/"
87
schedule:
98
interval: "daily"
9+
commit-message:
10+
include: "scope"
11+
prefix: "github-actions"
12+
labels:
13+
- "deps"
14+
open-pull-requests-limit: 10
15+
16+
...

‎.github/workflows/ci.yml

+35-24
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
1-
name: ci
1+
---
22

3-
on:
3+
name: CI
4+
5+
on: # yamllint disable-line rule:truthy
46
push:
57
branches:
68
- 'master'
79
tags:
8-
- 'v*'
10+
- 'v*.*.*'
911
pull_request:
1012
branches:
1113
- 'master'
14+
release:
15+
types:
16+
- 'created'
17+
schedule:
18+
# Every Sunday at 08:10
19+
- cron: '10 8 * * 0'
1220

1321
jobs:
1422
build:
@@ -17,19 +25,22 @@ jobs:
1725
strategy:
1826
fail-fast: false
1927
matrix:
20-
php_version: ['7.4', '8.0', '8.1']
28+
# Build only latest
29+
php_version: ['8.1']
30+
# Build all versions
31+
# php_version: ['7.4', '8.0', '8.1']
2132
php_type: ['fpm', 'cli', 'supervisord']
22-
os_version: ['alpine']
33+
os_name: ['alpine']
2334
steps:
2435
- uses: e1himself/[email protected]
2536

2637
- name: Checkout
27-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3.1.0
2839

2940
- name: Set Environment Variables
3041
env:
3142
IMAGE_NAMESPACE: wayofdev/php-dev
32-
TEMPLATE: ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_version }}
43+
TEMPLATE: ${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}
3344
run: |
3445
export RELEASE_VERSION=${GITHUB_REF#refs/*/}
3546
echo "IMAGE_NAMESPACE=${IMAGE_NAMESPACE}" >> $GITHUB_ENV
@@ -38,7 +49,7 @@ jobs:
3849
3950
- name: Docker Meta
4051
id: meta
41-
uses: docker/metadata-action@v3
52+
uses: docker/metadata-action@v4
4253
with:
4354
images: ${{ env.IMAGE_NAMESPACE }}
4455
tags: |
@@ -48,30 +59,28 @@ jobs:
4859
type=semver,pattern={{major}}.{{minor}}
4960
flavor: |
5061
latest=false
51-
prefix=${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_version }}-
62+
prefix=${{ matrix.php_version }}-${{ matrix.php_type }}-${{ matrix.os_name }}-
5263
5364
- name: Login to DockerHub
5465
if: github.event_name != 'pull_request'
55-
uses: docker/login-action@v1
66+
uses: docker/login-action@v2
5667
with:
5768
username: ${{ secrets.DOCKER_USERNAME }}
5869
password: ${{ secrets.DOCKER_TOKEN }}
5970

60-
#
6171
### For Cross Platform OSX builds uncomment these lines
62-
#
63-
# - name: Set up QEMU
64-
# uses: docker/setup-qemu-action@v1
65-
# with:
66-
# platforms: arm64
67-
#
68-
# - name: Set up Docker Buildx
69-
# uses: docker/setup-buildx-action@v1
70-
# with:
71-
# install: true
72+
- name: Set up QEMU
73+
uses: docker/setup-qemu-action@v2
74+
with:
75+
platforms: arm64
76+
77+
- name: Set up Docker Buildx
78+
uses: docker/setup-buildx-action@v2
79+
with:
80+
install: true
7281

7382
- name: Build and Export to Docker
74-
uses: docker/build-push-action@v2
83+
uses: docker/build-push-action@v3
7584
with:
7685
context: ./dist/dev/${{ env.TEMPLATE }}
7786
load: true
@@ -91,12 +100,14 @@ jobs:
91100
IMAGE_TAG=${{ env.IMAGE_NAMESPACE }}:${{ env.TEMPLATE }}-latest make test
92101
93102
- name: Push Docker Image
94-
uses: docker/build-push-action@v2
103+
uses: docker/build-push-action@v3
95104
with:
96105
context: ./dist/dev/${{ env.TEMPLATE }}
97106
### For Cross Platform OSX builds uncomment these lines
98-
# platforms: linux/amd64,linux/arm64
107+
platforms: linux/amd64,linux/arm64
99108
push: ${{ github.event_name != 'pull_request' }}
100109
tags: ${{ steps.meta.outputs.tags }}
101110
cache-from: type=registry,ref=${{ env.IMAGE_TAG }}
102111
cache-to: type=inline
112+
113+
...

‎.github/workflows/release-please.yml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
---
2+
3+
# https://github.com/google-github-actions/release-please-action#release-types-supported
4+
5+
on: # yamllint disable-line rule:truthy
6+
push:
7+
branches:
8+
- master
9+
10+
name: release-please
11+
12+
jobs:
13+
release-please:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: google-github-actions/release-please-action@v3
17+
id: release
18+
with:
19+
token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
20+
release-type: node
21+
package-name: docker-php-dev
22+
default-branch: master
23+
changelog-types: |
24+
[
25+
{ "type": "feat", "section": "Features", "hidden": false },
26+
{ "type": "fix", "section": "Bug Fixes", "hidden": false },
27+
{ "type": "perf", "section": "Performance Improvements", "hidden": false },
28+
{ "type": "docs", "section": "Documentation", "hidden": false },
29+
{ "type": "chore", "section": "Miscellaneous", "hidden": false },
30+
{ "type": "style", "section": "Styles", "hidden": true },
31+
{ "type": "revert", "section": "Reverts", "hidden": true },
32+
{ "type": "deps", "section": "Dependencies", "hidden": true },
33+
{ "type": "refactor", "section": "Code Refactoring", "hidden": true },
34+
{ "type": "test", "section": "Tests", "hidden": true },
35+
{ "type": "build", "section": "Build System", "hidden": true },
36+
{ "type": "ci", "section": "Continuous Integration", "hidden": true }
37+
]
38+
39+
...

‎.github/workflows/shellcheck.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
3+
name: Differential ShellCheck
4+
5+
on: # yamllint disable-line rule:truthy
6+
pull_request:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
shellcheck:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Repository checkout
17+
uses: actions/checkout@v3
18+
with:
19+
fetch-depth: 0
20+
21+
- name: Differential ShellCheck
22+
uses: redhat-plumbers-in-action/differential-shellcheck@latest
23+
with:
24+
severity: warning
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
27+
...

‎.pre-commit-config.yaml

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
---
22

33
repos:
4-
- hooks:
4+
- repo: https://github.com/pre-commit/pre-commit-hooks
5+
rev: v4.3.0
6+
hooks:
7+
- id: trailing-whitespace
8+
- id: end-of-file-fixer
9+
- id: fix-encoding-pragma
10+
11+
- repo: https://github.com/commitizen-tools/commitizen
12+
rev: v2.37.0
13+
hooks:
514
- id: commitizen
615
stages:
716
- commit-msg
8-
repo: https://github.com/commitizen-tools/commitizen
9-
rev: v2.20.0

‎.yamllint

+53-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,61 @@
11
---
2-
extends: default
32

3+
extends: "default"
4+
5+
ignore: |
6+
.build/
7+
vendor/
48
# Overwrite above default rules
59
rules:
10+
braces:
11+
# Defaults
12+
# min-spaces-inside: 0
13+
# max-spaces-inside: 0
14+
15+
# Keep 0 min-spaces to not error on empty {} collection definitions
16+
min-spaces-inside: 0
17+
18+
# Allow one space inside braces to improve code readability
19+
max-spaces-inside: 1
20+
21+
brackets:
22+
# Defaults
23+
# min-spaces-inside: 0
24+
# max-spaces-inside: 0
25+
26+
# Keep 0 min-spaces to not error on empty [] collection definitions
27+
min-spaces-inside: 0
28+
29+
# Allow one space inside braces to improve code readability
30+
max-spaces-inside: 1
31+
632
colons:
7-
max-spaces-before: 0
8-
max-spaces-after: 60
33+
# Defaults
34+
# min-spaces-before: 0
35+
# max-spaces-after: 1
36+
37+
# Allow multiple spaces after a colon to allow indentation of YAML
38+
# dictionary values
39+
max-spaces-after: -1
40+
41+
commas:
42+
# Defaults
43+
# max-spaces-after: 1
44+
45+
# Allow multiple spaces after a comma to allow indentation of YAML
46+
# dictionary values
47+
max-spaces-after: -1
48+
949
comments:
1050
require-starting-space: true
1151
min-spaces-from-content: 1
12-
line-length: disable
52+
53+
line-length:
54+
max: 180
55+
level: warning
56+
57+
yaml-files:
58+
- "*.yaml"
59+
- "*.yml"
60+
61+
...

‎CHANGELOG.md

-19
This file was deleted.

0 commit comments

Comments
 (0)