Merge branch 'hassio-addons:main' into patch-v4.0-conflicts

This commit is contained in:
Matthieu Baerts 2023-10-14 14:12:31 +02:00 committed by GitHub
commit c9ea024017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.1.3 ARG BUILD_FROM=ghcr.io/hassio-addons/base:14.2.2
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
@ -10,7 +10,7 @@ ARG GROCY_VERSION="v4.0.3"
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN \ RUN \
apk add --no-cache \ apk add --no-cache \
composer=2.5.8-r0 \ composer=2.6.5-r0 \
nginx=1.24.0-r6 \ nginx=1.24.0-r6 \
patch=2.7.6-r10 \ patch=2.7.6-r10 \
php81-ctype=8.1.23-r0 \ php81-ctype=8.1.23-r0 \

View file

@ -1,10 +1,10 @@
--- ---
build_from: build_from:
aarch64: ghcr.io/hassio-addons/base:14.1.3 aarch64: ghcr.io/hassio-addons/base:14.2.2
amd64: ghcr.io/hassio-addons/base:14.1.3 amd64: ghcr.io/hassio-addons/base:14.2.2
armhf: ghcr.io/hassio-addons/base:14.1.3 armhf: ghcr.io/hassio-addons/base:14.2.2
armv7: ghcr.io/hassio-addons/base:14.1.3 armv7: ghcr.io/hassio-addons/base:14.2.2
i386: ghcr.io/hassio-addons/base:14.1.3 i386: ghcr.io/hassio-addons/base:14.2.2
codenotary: codenotary:
base_image: codenotary@frenck.dev base_image: codenotary@frenck.dev
signer: codenotary@frenck.dev signer: codenotary@frenck.dev