Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- cron: '0 0 1 * *'
push:
workflow_dispatch:
pull_request:


jobs:
Expand All @@ -15,7 +16,7 @@ jobs:
- name: Setup PHP with PECL extension
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.3
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
Expand Down
42 changes: 20 additions & 22 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BUILD_STAGE=prod

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

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

RUN apk add --update \
php8 \
php8-json \
php8-pecl-yaml \
php8-curl \
php8-dom \
php8-pdo \
php8-simplexml \
php8-tokenizer \
php8-xml \
php8-xmlwriter \
php8-posix \
php8-ctype \
php83 \
php83-json \
php83-pecl-yaml \
php83-curl \
php83-dom \
php83-pdo \
php83-simplexml \
php83-tokenizer \
php83-xml \
php83-xmlwriter \
php83-posix \
php83-ctype \
file \
composer \
git \
Expand All @@ -47,21 +47,21 @@ RUN git config --global --add safe.directory /app
#
# prod
#
FROM base as prod
FROM base AS prod

RUN apk add --update \
php8 \
php8-json \
php8-pecl-yaml \
php8-curl \
php83 \
php83-json \
php83-pecl-yaml \
php83-curl \
composer \
&& rm -rf /var/cache/apk/*

#
# finish
#

FROM ${BUILD_STAGE} as finish
FROM ${BUILD_STAGE} AS finish

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

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


36 changes: 18 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
"license": "MIT",
"type": "project",
"require": {
"php": "8.0.*",
"php": "~8.3.0",
"ext-curl": "*",
"ext-yaml": "*",
"sentry/sdk": "^3.5",
"symfony/config": "^5.4.21",
"symfony/console": "^5.4.24",
"symfony/dependency-injection": "^5.4.25",
"symfony/error-handler": "^5.4.24",
"symfony/finder": "^5.4.21",
"symfony/lock": "^5.4.25",
"symfony/process": "^5.4.24",
"symfony/var-dumper": "^5.4.25",
"symfony/yaml": "^5.4.23",
"sentry/sdk": "^3.6",
"symfony/config": "^5.4.46",
"symfony/console": "^5.4.47",
"symfony/dependency-injection": "^5.4.48",
"symfony/error-handler": "^5.4.46",
"symfony/finder": "^5.4.45",
"symfony/lock": "^5.4.45",
"symfony/process": "^5.4.47",
"symfony/var-dumper": "^5.4.48",
"symfony/yaml": "^5.4.45",
"thecodingmachine/safe": "^2.5"
},
"require-dev": {
"phpunit/phpunit": "*",
"pluswerk/grumphp-config": "^6.5",
"spatie/phpunit-watcher": "*"
"phpunit/phpunit": ">=12.4.3",
"pluswerk/grumphp-config": "^10.1.5",
"spatie/phpunit-watcher": ">=1.23.6"
},
"autoload": {
"psr-4": {
Expand All @@ -35,15 +35,15 @@
},
"config": {
"allow-plugins": {
"ergebnis/composer-normalize": true,
"php-http/discovery": true,
"phpro/grumphp": true,
"phpstan/extension-installer": true,
"pluswerk/grumphp-config": true,
"php-http/discovery": true,
"ergebnis/composer-normalize": true
"pluswerk/grumphp-config": true
},
"optimize-autoloader": true,
"platform": {
"php": "8.0"
"php": "8.3.12"
},
"process-timeout": 0,
"sort-packages": true
Expand Down
Loading
Loading