Skip to content

Commit b0bc99d

Browse files
authored
Merge pull request #15 from Kanti/upgrade-dependencies
2 parents 8f74ff0 + 46187aa commit b0bc99d

20 files changed

Lines changed: 3045 additions & 1683 deletions

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- cron: '0 0 1 * *'
77
push:
88
workflow_dispatch:
9+
pull_request:
910

1011

1112
jobs:
@@ -15,7 +16,7 @@ jobs:
1516
- name: Setup PHP with PECL extension
1617
uses: shivammathur/setup-php@v2
1718
with:
18-
php-version: 8.0
19+
php-version: 8.3
1920
- uses: actions/checkout@v4
2021
- uses: actions/cache@v4
2122
with:

Dockerfile

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG BUILD_STAGE=prod
22

3-
FROM certbot/dns-cloudflare:v2.5.0 as base
3+
FROM certbot/dns-cloudflare:v5.0.0 AS base
44

55
RUN wget https://github.com/nginx-proxy/docker-gen/releases/download/0.10.4/docker-gen-alpine-linux-amd64-0.10.4.tar.gz && \
66
tar xvzf docker-gen-alpine-linux-amd64-0.10.4.tar.gz && \
@@ -19,21 +19,21 @@ RUN apk add --update curl \
1919
#
2020
# dev
2121
#
22-
FROM base as dev
22+
FROM base AS dev
2323

2424
RUN apk add --update \
25-
php8 \
26-
php8-json \
27-
php8-pecl-yaml \
28-
php8-curl \
29-
php8-dom \
30-
php8-pdo \
31-
php8-simplexml \
32-
php8-tokenizer \
33-
php8-xml \
34-
php8-xmlwriter \
35-
php8-posix \
36-
php8-ctype \
25+
php83 \
26+
php83-json \
27+
php83-pecl-yaml \
28+
php83-curl \
29+
php83-dom \
30+
php83-pdo \
31+
php83-simplexml \
32+
php83-tokenizer \
33+
php83-xml \
34+
php83-xmlwriter \
35+
php83-posix \
36+
php83-ctype \
3737
file \
3838
composer \
3939
git \
@@ -47,21 +47,21 @@ RUN git config --global --add safe.directory /app
4747
#
4848
# prod
4949
#
50-
FROM base as prod
50+
FROM base AS prod
5151

5252
RUN apk add --update \
53-
php8 \
54-
php8-json \
55-
php8-pecl-yaml \
56-
php8-curl \
53+
php83 \
54+
php83-json \
55+
php83-pecl-yaml \
56+
php83-curl \
5757
composer \
5858
&& rm -rf /var/cache/apk/*
5959

6060
#
6161
# finish
6262
#
6363

64-
FROM ${BUILD_STAGE} as finish
64+
FROM ${BUILD_STAGE} AS finish
6565

6666
COPY src /app/src
6767
COPY templates /app/templates
@@ -78,5 +78,3 @@ ENV RELEASE_TAG=${RELEASE_TAG}
7878
ENTRYPOINT ["/app/s", "entrypoint"]
7979

8080
CMD ["docker-gen --watch --interval 60 --notify-output --notify './s' templates/data.tmpl var/data.json"]
81-
82-

composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"license": "MIT",
44
"type": "project",
55
"require": {
6-
"php": "8.0.*",
6+
"php": "~8.3.0",
77
"ext-curl": "*",
88
"ext-yaml": "*",
9-
"sentry/sdk": "^3.5",
10-
"symfony/config": "^5.4.21",
11-
"symfony/console": "^5.4.24",
12-
"symfony/dependency-injection": "^5.4.25",
13-
"symfony/error-handler": "^5.4.24",
14-
"symfony/finder": "^5.4.21",
15-
"symfony/lock": "^5.4.25",
16-
"symfony/process": "^5.4.24",
17-
"symfony/var-dumper": "^5.4.25",
18-
"symfony/yaml": "^5.4.23",
9+
"sentry/sdk": "^3.6",
10+
"symfony/config": "^5.4.46",
11+
"symfony/console": "^5.4.47",
12+
"symfony/dependency-injection": "^5.4.48",
13+
"symfony/error-handler": "^5.4.46",
14+
"symfony/finder": "^5.4.45",
15+
"symfony/lock": "^5.4.45",
16+
"symfony/process": "^5.4.47",
17+
"symfony/var-dumper": "^5.4.48",
18+
"symfony/yaml": "^5.4.45",
1919
"thecodingmachine/safe": "^2.5"
2020
},
2121
"require-dev": {
22-
"phpunit/phpunit": "*",
23-
"pluswerk/grumphp-config": "^6.5",
24-
"spatie/phpunit-watcher": "*"
22+
"phpunit/phpunit": ">=12.4.3",
23+
"pluswerk/grumphp-config": "^10.1.5",
24+
"spatie/phpunit-watcher": ">=1.23.6"
2525
},
2626
"autoload": {
2727
"psr-4": {
@@ -35,15 +35,15 @@
3535
},
3636
"config": {
3737
"allow-plugins": {
38+
"ergebnis/composer-normalize": true,
39+
"php-http/discovery": true,
3840
"phpro/grumphp": true,
3941
"phpstan/extension-installer": true,
40-
"pluswerk/grumphp-config": true,
41-
"php-http/discovery": true,
42-
"ergebnis/composer-normalize": true
42+
"pluswerk/grumphp-config": true
4343
},
4444
"optimize-autoloader": true,
4545
"platform": {
46-
"php": "8.0"
46+
"php": "8.3.12"
4747
},
4848
"process-timeout": 0,
4949
"sort-packages": true

0 commit comments

Comments
 (0)