Skip to content

Commit

Permalink
Merge branch 'main' into grocy-print
Browse files Browse the repository at this point in the history
  • Loading branch information
valadas authored Dec 23, 2024
2 parents 0cb55af + 532b2fa commit a7c6dec
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
42 changes: 21 additions & 21 deletions grocy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
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
FROM ${BUILD_FROM}

# Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# Setup base
ARG GROCY_VERSION="v4.2.0"
ARG GROCY_VERSION="v4.3.0"
# hadolint ignore=DL3003
RUN \
apk add --no-cache \
composer=2.7.6-r0 \
composer=2.7.7-r0 \
nginx=1.24.0-r16 \
patch=2.7.6-r10 \
php82-ctype=8.2.19-r0 \
php82-exif=8.2.19-r0 \
php82-fileinfo=8.2.19-r0 \
php82-fpm=8.2.19-r0 \
php82-gd=8.2.19-r0 \
php82-iconv=8.2.19-r0 \
php82-intl=8.2.19-r0 \
php82-ldap=8.2.19-r0 \
php82-mbstring=8.2.19-r0 \
php82-opcache=8.2.19-r0 \
php82-pdo_sqlite=8.2.19-r0 \
php82-pdo=8.2.19-r0 \
php82-simplexml=8.2.19-r0 \
php82-tokenizer=8.2.19-r0 \
php82=8.2.19-r0 \
php82-ctype=8.2.26-r0 \
php82-exif=8.2.26-r0 \
php82-fileinfo=8.2.26-r0 \
php82-fpm=8.2.26-r0 \
php82-gd=8.2.26-r0 \
php82-iconv=8.2.26-r0 \
php82-intl=8.2.26-r0 \
php82-ldap=8.2.26-r0 \
php82-mbstring=8.2.26-r0 \
php82-opcache=8.2.26-r0 \
php82-pdo_sqlite=8.2.26-r0 \
php82-pdo=8.2.26-r0 \
php82-simplexml=8.2.26-r0 \
php82-tokenizer=8.2.26-r0 \
php82=8.2.26-r0 \
\
&& apk add --no-cache --virtual .build-dependencies \
git=2.43.4-r0 \
php82-openssl=8.2.19-r0 \
php82-phar=8.2.19-r0 \
git=2.43.5-r0 \
php82-openssl=8.2.26-r0 \
php82-phar=8.2.26-r0 \
\
&& yarn global add modclean \
\
Expand Down
6 changes: 3 additions & 3 deletions grocy/build.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
build_from:
aarch64: ghcr.io/hassio-addons/base-nodejs:0.2.1
amd64: ghcr.io/hassio-addons/base-nodejs:0.2.1
armv7: 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.5
armv7: ghcr.io/hassio-addons/base-nodejs:0.2.5
codenotary:
base_image: [email protected]
signer: [email protected]
1 change: 1 addition & 0 deletions grocy/rootfs/etc/php82/conf.d/99-grocy.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ opcache.revalidate_freq=0
opcache.validate_timestamps=0
php_admin_value[post_max_size] = 64M
php_admin_value[upload_max_filesize] = 64M
memory_limit = 384M

0 comments on commit a7c6dec

Please sign in to comment.