Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades add-on base image to v9.0.1 #111

Merged
merged 7 commits into from
Jan 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions grocy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:8.0.5
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.0.1
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -9,23 +9,23 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=DL3003
RUN \
apk add --no-cache \
nginx=1.18.0-r1 \
php7-fpm=7.3.23-r0 \
php7-gd=7.3.23-r0 \
php7-json=7.3.23-r0 \
php7-mbstring=7.3.23-r0 \
php7-opcache=7.3.23-r0 \
php7-pdo_sqlite=7.3.23-r0 \
php7-pdo=7.3.23-r0 \
php7-simplexml=7.3.23-r0 \
php7-tokenizer=7.3.23-r0 \
php7-fileinfo=7.3.23-r0 \
php7=7.3.23-r0 \
nginx=1.18.0-r13 \
php7-fpm=7.4.14-r0 \
php7-gd=7.4.14-r0 \
php7-json=7.4.14-r0 \
php7-mbstring=7.4.14-r0 \
php7-opcache==7.4.14-r0 \
php7-pdo_sqlite=7.4.14-r0 \
php7-pdo==7.4.14-r0 \
php7-simplexml=7.4.14-r0 \
php7-tokenizer=7.4.14-r0 \
php7-fileinfo=7.4.14-r0 \
php7=7.4.14-r0 \
\
&& apk add --no-cache --virtual .build-dependencies \
git=2.26.2-r0 \
yarn=1.22.4-r0 \
composer=1.10.16-r0 \
git=2.30.0-r0 \
yarn=1.22.10-r0 \
composer=2.0.8-r0 \
\
&& yarn global add modclean \
\
Expand Down
10 changes: 5 additions & 5 deletions grocy/build.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"build_from": {
"aarch64": "hassioaddons/base-aarch64:8.0.5",
"amd64": "hassioaddons/base-amd64:8.0.5",
"armhf": "hassioaddons/base-armhf:8.0.5",
"armv7": "hassioaddons/base-armv7:8.0.5",
"i386": "hassioaddons/base-i386:8.0.5"
"aarch64": "ghcr.io/hassio-addons/base/aarch64:9.0.1",
"amd64": "ghcr.io/hassio-addons/base/amd64:9.0.1",
"armhf": "ghcr.io/hassio-addons/base/armhf:9.0.1",
"armv7": "ghcr.io/hassio-addons/base/armv7:9.0.1",
"i386": "ghcr.io/hassio-addons/base/i386:9.0.1"
}
}
1 change: 0 additions & 1 deletion grocy/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"panel_icon": "mdi:cart",
"startup": "system",
"arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
"hassio_api": true,
"map": ["ssl"],
"ports": {
"80/tcp": null
Expand Down