mirror of
https://github.com/hassio-addons/addon-grocy.git
synced 2025-05-04 19:21:24 +00:00
⬆️ Update ghcr.io/hassio-addons/base Docker tag to v15 (#416)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Franck Nijhof <git@frenck.dev>
This commit is contained in:
parent
e454d685f4
commit
6698b6a66e
8 changed files with 30 additions and 31 deletions
|
@ -1,4 +1,4 @@
|
|||
ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.3.3
|
||||
ARG BUILD_FROM=ghcr.io/hassio-addons/base-nodejs:0.1.0
|
||||
# hadolint ignore=DL3006
|
||||
FROM ${BUILD_FROM}
|
||||
|
||||
|
@ -10,30 +10,29 @@ ARG GROCY_VERSION="v4.0.3"
|
|||
# hadolint ignore=DL3003
|
||||
RUN \
|
||||
apk add --no-cache \
|
||||
composer=2.6.5-r0 \
|
||||
nginx=1.24.0-r7 \
|
||||
composer=2.6.6-r0 \
|
||||
nginx=1.24.0-r14 \
|
||||
patch=2.7.6-r10 \
|
||||
php81-ctype=8.1.26-r0 \
|
||||
php81-exif=8.1.26-r0 \
|
||||
php81-fileinfo=8.1.26-r0 \
|
||||
php81-fpm=8.1.26-r0 \
|
||||
php81-gd=8.1.26-r0 \
|
||||
php81-iconv=8.1.26-r0 \
|
||||
php81-intl=8.1.26-r0 \
|
||||
php81-ldap=8.1.26-r0 \
|
||||
php81-mbstring=8.1.26-r0 \
|
||||
php81-opcache=8.1.26-r0 \
|
||||
php81-pdo_sqlite=8.1.26-r0 \
|
||||
php81-pdo=8.1.26-r0 \
|
||||
php81-simplexml=8.1.26-r0 \
|
||||
php81-tokenizer=8.1.26-r0 \
|
||||
php81=8.1.26-r0 \
|
||||
php82-ctype=8.2.14-r0 \
|
||||
php82-exif=8.2.14-r0 \
|
||||
php82-fileinfo=8.2.14-r0 \
|
||||
php82-fpm=8.2.14-r0 \
|
||||
php82-gd=8.2.14-r0 \
|
||||
php82-iconv=8.2.14-r0 \
|
||||
php82-intl=8.2.14-r0 \
|
||||
php82-ldap=8.2.14-r0 \
|
||||
php82-mbstring=8.2.14-r0 \
|
||||
php82-opcache=8.2.14-r0 \
|
||||
php82-pdo_sqlite=8.2.14-r0 \
|
||||
php82-pdo=8.2.14-r0 \
|
||||
php82-simplexml=8.2.14-r0 \
|
||||
php82-tokenizer=8.2.14-r0 \
|
||||
php82=8.2.14-r0 \
|
||||
\
|
||||
&& apk add --no-cache --virtual .build-dependencies \
|
||||
git=2.40.1-r0 \
|
||||
php81-openssl=8.1.26-r0 \
|
||||
php81-phar=8.1.26-r0 \
|
||||
yarn=1.22.19-r0 \
|
||||
git=2.43.0-r0 \
|
||||
php82-openssl=8.2.14-r0 \
|
||||
php82-phar=8.2.14-r0 \
|
||||
\
|
||||
&& yarn global add modclean \
|
||||
\
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
---
|
||||
build_from:
|
||||
aarch64: ghcr.io/hassio-addons/base:14.3.3
|
||||
amd64: ghcr.io/hassio-addons/base:14.3.3
|
||||
armv7: ghcr.io/hassio-addons/base:14.3.3
|
||||
aarch64: ghcr.io/hassio-addons/base-nodejs:0.1.0
|
||||
amd64: ghcr.io/hassio-addons/base-nodejs:0.1.0
|
||||
armv7: ghcr.io/hassio-addons/base-nodejs:0.1.0
|
||||
codenotary:
|
||||
base_image: codenotary@frenck.dev
|
||||
signer: codenotary@frenck.dev
|
||||
|
|
|
@ -11,8 +11,8 @@ bashio::var.json \
|
|||
port "^9002" \
|
||||
base "$(bashio::addon.ingress_entry)" \
|
||||
| tempio \
|
||||
-template /etc/php81/templates/php-fpm.gtpl \
|
||||
-out /etc/php81/php-fpm.d/ingress.conf
|
||||
-template /etc/php82/templates/php-fpm.gtpl \
|
||||
-out /etc/php82/php-fpm.d/ingress.conf
|
||||
|
||||
# Generate direct access configuration, if enabled.
|
||||
if bashio::var.has_value "$(bashio::addon.port 80)"; then
|
||||
|
@ -20,6 +20,6 @@ if bashio::var.has_value "$(bashio::addon.port 80)"; then
|
|||
name "www" \
|
||||
port "^9001" \
|
||||
| tempio \
|
||||
-template /etc/php81/templates/php-fpm.gtpl \
|
||||
-out /etc/php81/php-fpm.d/www.conf
|
||||
-template /etc/php82/templates/php-fpm.gtpl \
|
||||
-out /etc/php82/php-fpm.d/www.conf
|
||||
fi
|
||||
|
|
|
@ -90,4 +90,4 @@ GROCY_CULTURE=$(bashio::config "culture")
|
|||
GROCY_CURRENCY=$(bashio::config "currency")
|
||||
GROCY_ENTRY_PAGE=$(bashio::config 'entry_page')
|
||||
|
||||
exec php-fpm81 -R --nodaemonize
|
||||
exec php-fpm82 -R --nodaemonize
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue