Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent incompatible minor php version to be auto-merged #312

Merged
merged 3 commits into from
Nov 26, 2024
+18 −11
Merged

Prevent incompatible minor php version to be auto-merged #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd07b1d
Revert "Update php Docker tag (#310)"
LeoColomb Nov 26, 2024
b9175fc
Prevent minor php version to be auto-merged
LeoColomb Nov 26, 2024
2fbce2e
Fix linter
LeoColomb Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,26 @@
"customManagers": [
{
"customType": "regex",
"fileMatch": [
"(^|/|\\.)Dockerfile$",
"(^|/)Dockerfile\\.[^/]*$"
],
"fileMatch": ["(^|/|\\.)Dockerfile$", "(^|/)Dockerfile\\.[^/]*$"],
"matchStrings": [
"FROM (?<depName>.*?):(?<currentValue>\\d+(?:\\.\\d+)*)-"
],
"datasourceTemplate": "docker"
},
{
"customType": "regex",
"fileMatch": [
"(^|/|\\.)php-version$"
],
"fileMatch": ["(^|/|\\.)php-version$"],
"matchStrings": [
"(?<depName>.*?):(?<currentValue>.*?)@(?<currentDigest>sha256:\\w+)"
],
"datasourceTemplate": "docker"
}
],
"packageRules": [
{
"matchDepNames": ["php"],
"matchUpdateTypes": ["!major", "!minor"],
"automerge": true
}
]
}
5 changes: 5 additions & 0 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ on:
branches:
- main

permissions:
contents: read
packages: read
statuses: write

jobs:
super-linter:
name: Code Base
Expand Down
6 changes: 3 additions & 3 deletions images/yourls/.php-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
php:8.4.1-apache@sha256:18332cc2f59b5d953c46c570309fca971c6d1fbf8295b81e7ce582dbb76010d0
php:8.4.1-fpm@sha256:dcc82f2dcb7c39777621cc9e032c3210c2b139e763129cebb8b2a6f6d64eb074
php:8.4.1-fpm-alpine@sha256:79e748df9762464b4fbd27c079150b3fb5535bcdd1550daacf6dfce60fb9fb86
php:8.3.13-apache@sha256:b84148f7453d86e5b6a325aaaa70fbf3e8f455eb958bd398346912e5f03c991e
php:8.3.13-fpm@sha256:14fa9f2b4b71f624a5547f3d2b125bb25cc9fca0ed65a9e7a178fb055b61a446
php:8.3.13-fpm-alpine@sha256:c2da634fa06c6fb61fc18861795c5a28e5d96574c3257c57d0b49978fd1147a3
2 changes: 1 addition & 1 deletion images/yourls/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.4-%%VARIANT%%
FROM php:8.3-%%VARIANT%%

# install the PHP extensions we need
RUN set -eux; \
Expand Down