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 Apr 2, 2024
2 parents 79629fe + bfd382b commit 58a0617
Show file tree
Hide file tree
Showing 2 changed files with 24 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.1.2
ARG BUILD_FROM=ghcr.io/hassio-addons/base-nodejs:0.2.0
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

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

# Setup base
ARG GROCY_VERSION="v4.0.3"
ARG GROCY_VERSION="v4.2.0"
# hadolint ignore=DL3003
RUN \
apk add --no-cache \
composer=2.6.6-r0 \
nginx=1.24.0-r14 \
composer=2.7.1-r0 \
nginx=1.24.0-r15 \
patch=2.7.6-r10 \
php82-ctype=8.2.15-r0 \
php82-exif=8.2.15-r0 \
php82-fileinfo=8.2.15-r0 \
php82-fpm=8.2.15-r0 \
php82-gd=8.2.15-r0 \
php82-iconv=8.2.15-r0 \
php82-intl=8.2.15-r0 \
php82-ldap=8.2.15-r0 \
php82-mbstring=8.2.15-r0 \
php82-opcache=8.2.15-r0 \
php82-pdo_sqlite=8.2.15-r0 \
php82-pdo=8.2.15-r0 \
php82-simplexml=8.2.15-r0 \
php82-tokenizer=8.2.15-r0 \
php82=8.2.15-r0 \
php82-ctype=8.2.17-r0 \
php82-exif=8.2.17-r0 \
php82-fileinfo=8.2.17-r0 \
php82-fpm=8.2.17-r0 \
php82-gd=8.2.17-r0 \
php82-iconv=8.2.17-r0 \
php82-intl=8.2.17-r0 \
php82-ldap=8.2.17-r0 \
php82-mbstring=8.2.17-r0 \
php82-opcache=8.2.17-r0 \
php82-pdo_sqlite=8.2.17-r0 \
php82-pdo=8.2.17-r0 \
php82-simplexml=8.2.17-r0 \
php82-tokenizer=8.2.17-r0 \
php82=8.2.17-r0 \
\
&& apk add --no-cache --virtual .build-dependencies \
git=2.43.0-r0 \
php82-openssl=8.2.15-r0 \
php82-phar=8.2.15-r0 \
php82-openssl=8.2.17-r0 \
php82-phar=8.2.17-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.1.2
amd64: ghcr.io/hassio-addons/base-nodejs:0.1.2
armv7: ghcr.io/hassio-addons/base-nodejs:0.1.2
aarch64: ghcr.io/hassio-addons/base-nodejs:0.2.0
amd64: ghcr.io/hassio-addons/base-nodejs:0.2.0
armv7: ghcr.io/hassio-addons/base-nodejs:0.2.0
codenotary:
base_image: [email protected]
signer: [email protected]

0 comments on commit 58a0617

Please sign in to comment.