Skip to content

Commit 221ba95

Browse files
committed
feat: Add configuration files for Gitleaks and Hadolint, update README.md badges, and adjust Docker settings.
1 parent 9346ec0 commit 221ba95

File tree

7 files changed

+27
-20
lines changed

7 files changed

+27
-20
lines changed

.github/linters/.gitleaks.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
title = "gitleaks config"
2+
3+
[allowlist]
4+
description = "Allowlisted files"
5+
paths = [
6+
'''docker/ssl/.*''',
7+
]

.github/linters/.hadolint.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
ignored:
3+
- DL3008 # Pin versions in apk add.
4+
- DL3015 # Avoid additional packages by specifying `--no-install-recommends`.
5+
- DL3022 # `COPY --from` should reference a previously defined `FROM` alias
6+
- DL4006 # Set the SHELL option -o pipefail before RUN with a pipe in it.

README.md

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,11 @@
1111
<!-- markdownlint-enable MD041 -->
1212

1313
<p align="center">
14-
<a href="https://www.php.net/releases/8.1/en.php" target="_blank">
15-
<img src="https://img.shields.io/badge/%3E%3D8.1-777BB4.svg?style=for-the-badge&logo=php&logoColor=white" alt="PHP version">
16-
</a>
17-
<a href="https://github.com/yiisoft/yii2/tree/2.0.53" target="_blank">
18-
<img src="https://img.shields.io/badge/2.0.x-0073AA.svg?style=for-the-badge&logo=yii&logoColor=white" alt="Yii 2.0.x">
19-
</a>
20-
<a href="https://github.com/yiisoft/yii2/tree/22.0" target="_blank">
21-
<img src="https://img.shields.io/badge/22.0.x-0073AA.svg?style=for-the-badge&logo=yii&logoColor=white" alt="Yii 22.0.x">
22-
</a>
2314
<a href="https://github.com/yii2-extensions/app-basic/actions/workflows/build.yml?query=branch%3Afranken-php-classic" target="_blank">
24-
<img src="https://img.shields.io/github/actions/workflow/status/yii2-extensions/app-basic/build.yml?branch=franken-php-classic&style=for-the-badge&label=Codeception" alt="Codeception">
15+
<img src="https://img.shields.io/github/actions/workflow/status/yii2-extensions/app-basic/build.yml?branch=franken-php-classic&logo=github&style=for-the-badge&label=Codeception" alt="Codeception">
2516
</a>
2617
<a href="https://github.com/yii2-extensions/app-basic/actions/workflows/static.yml?query=branch%3Afranken-php-classic" target="_blank">
27-
<img src="https://img.shields.io/github/actions/workflow/status/yii2-extensions/app-basic/static.yml?branch=franken-php-classic&style=for-the-badge&label=PHPStan" alt="PHPStan">
18+
<img src="https://img.shields.io/github/actions/workflow/status/yii2-extensions/app-basic/static.yml?branch=franken-php-classic&logo=github&style=for-the-badge&label=PHPStan" alt="PHPStan">
2819
</a>
2920
</p>
3021

@@ -144,12 +135,16 @@ final class SiteController extends Controller
144135

145136
## Package information
146137

147-
[![Development Status](https://img.shields.io/badge/Status-Dev-orange.svg?style=for-the-badge&logo=packagist&logoColor=white)](https://github.com/yii2-extensions/app-basic/tree/franken-php-classic)
138+
[![PHP](https://img.shields.io/badge/%3E%3D8.1-777BB4.svg?style=for-the-badge&logo=php&logoColor=white)](https://www.php.net/releases/8.1/en.php)
139+
[![Yii 2.0.x](https://img.shields.io/badge/2.0.53-0073AA.svg?style=for-the-badge&logo=yii&logoColor=white)](https://github.com/yiisoft/yii2/tree/2.0.53)
140+
[![Yii 22.0.x](https://img.shields.io/badge/22.0.x-0073AA.svg?style=for-the-badge&logo=yii&logoColor=white)](https://github.com/yiisoft/yii2/tree/22.0)
141+
[![Latest Stable Version](https://img.shields.io/packagist/v/yii2-extensions/app-basic.svg?style=for-the-badge&logo=packagist&logoColor=white&label=Stable)](https://packagist.org/packages/yii2-extensions/app-basic)
148142

149143
## Quality code
150144

151145
[![Codecov](https://img.shields.io/codecov/c/github/yii2-extensions/app-basic.svg?branch=main&style=for-the-badge&logo=codecov&logoColor=white&label=Coverage)](https://codecov.io/github/yii2-extensions/app-basic)
152146
[![PHPStan Level Max](https://img.shields.io/badge/PHPStan-Level%20Max-4F5D95.svg?style=for-the-badge&logo=php&logoColor=white)](https://github.com/yii2-extensions/app-basic/actions/workflows/static.yml?query=branch%3Afranken-php-classic)
147+
[![Super-Linter](https://img.shields.io/github/actions/workflow/status/yii2-extensions/app-basic/linter.yml?style=for-the-badge&label=Super-Linter&logo=github)](https://github.com/yii2-extensions/app-basic/actions/workflows/linter.yml?query=branch%3Afranken-php-classic)
153148
[![StyleCI](https://img.shields.io/badge/StyleCI-Passed-44CC11.svg?style=for-the-badge&logo=styleci&logoColor=white)](https://github.styleci.io/repos/165419144?branch=franken-php-classic)
154149

155150
## Documentation

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ services:
2323
retries: 5
2424
start_period: 20s
2525
ports:
26-
- '8080:80'
27-
- '8443:443'
28-
- '8443:443/udp'
26+
- "8080:80"
27+
- "8443:443"
28+
- "8443:443/udp"
2929
restart: always
3030
tty: true
3131
volumes:

docker/entrypoint.sh

100644100755
File mode changed.

docker/init.sh

100644100755
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ if [ -f "/app/composer.json" ] && [ ! -d "/app/vendor" ]; then
5555
echo -e "${YELLOW}Installing Composer dependencies...${NC}"
5656

5757
# Give www-data write access without exposing the tree to everyone
58-
chown -R www-data:www-data /app && \
59-
chmod -R u+rwX,g+rwX /app
58+
chown -R www-data:www-data /app && chmod -R u+rwX,g+rwX /app
6059

6160
# Create and configure npm cache directory for www-data
6261
mkdir -p /var/www/.npm

tests/Acceptance.suite.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# If you need both WebDriver and PHPBrowser tests - create a separate suite.
77
actor: AcceptanceTester
88
modules:
9-
enabled:
10-
- PhpBrowser:
11-
url: https://localhost:443/
9+
enabled:
10+
- PhpBrowser:
11+
url: https://localhost:443/
1212
step_decorators: ~

0 commit comments

Comments
 (0)