Merge branch 'main' into grocy-print

This commit is contained in:
Daniel Valadas 2024-12-23 16:03:24 -05:00 committed by GitHub
commit a7c6dec433
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 24 deletions

View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base-nodejs:0.2.1 ARG BUILD_FROM=ghcr.io/hassio-addons/base-nodejs:0.2.5
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
@ -6,33 +6,33 @@ FROM ${BUILD_FROM}
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Setup base # Setup base
ARG GROCY_VERSION="v4.2.0" ARG GROCY_VERSION="v4.3.0"
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
composer=2.7.6-r0 \ composer=2.7.7-r0 \
nginx=1.24.0-r16 \ nginx=1.24.0-r16 \
patch=2.7.6-r10 \ patch=2.7.6-r10 \
php82-ctype=8.2.19-r0 \ php82-ctype=8.2.26-r0 \
php82-exif=8.2.19-r0 \ php82-exif=8.2.26-r0 \
php82-fileinfo=8.2.19-r0 \ php82-fileinfo=8.2.26-r0 \
php82-fpm=8.2.19-r0 \ php82-fpm=8.2.26-r0 \
php82-gd=8.2.19-r0 \ php82-gd=8.2.26-r0 \
php82-iconv=8.2.19-r0 \ php82-iconv=8.2.26-r0 \
php82-intl=8.2.19-r0 \ php82-intl=8.2.26-r0 \
php82-ldap=8.2.19-r0 \ php82-ldap=8.2.26-r0 \
php82-mbstring=8.2.19-r0 \ php82-mbstring=8.2.26-r0 \
php82-opcache=8.2.19-r0 \ php82-opcache=8.2.26-r0 \
php82-pdo_sqlite=8.2.19-r0 \ php82-pdo_sqlite=8.2.26-r0 \
php82-pdo=8.2.19-r0 \ php82-pdo=8.2.26-r0 \
php82-simplexml=8.2.19-r0 \ php82-simplexml=8.2.26-r0 \
php82-tokenizer=8.2.19-r0 \ php82-tokenizer=8.2.26-r0 \
php82=8.2.19-r0 \ php82=8.2.26-r0 \
\ \
&& apk add --no-cache --virtual .build-dependencies \ && apk add --no-cache --virtual .build-dependencies \
git=2.43.4-r0 \ git=2.43.5-r0 \
php82-openssl=8.2.19-r0 \ php82-openssl=8.2.26-r0 \
php82-phar=8.2.19-r0 \ php82-phar=8.2.26-r0 \
\ \
&& yarn global add modclean \ && yarn global add modclean \
\ \

View file

@ -1,8 +1,8 @@
--- ---
build_from: build_from:
aarch64: ghcr.io/hassio-addons/base-nodejs:0.2.1 aarch64: ghcr.io/hassio-addons/base-nodejs:0.2.5
amd64: ghcr.io/hassio-addons/base-nodejs:0.2.1 amd64: ghcr.io/hassio-addons/base-nodejs:0.2.5
armv7: ghcr.io/hassio-addons/base-nodejs:0.2.1 armv7: ghcr.io/hassio-addons/base-nodejs:0.2.5
codenotary: codenotary:
base_image: codenotary@frenck.dev base_image: codenotary@frenck.dev
signer: codenotary@frenck.dev signer: codenotary@frenck.dev

View file

@ -8,3 +8,4 @@ opcache.revalidate_freq=0
opcache.validate_timestamps=0 opcache.validate_timestamps=0
php_admin_value[post_max_size] = 64M php_admin_value[post_max_size] = 64M
php_admin_value[upload_max_filesize] = 64M php_admin_value[upload_max_filesize] = 64M
memory_limit = 384M