From 1aba9ca484350f96ceff39bdecc72ba872b2b184 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Thu, 24 Jun 2021 17:24:55 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on=20base?=
 =?UTF-8?q?=20image=20to=20v10.0.0=20(#193)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 grocy/Dockerfile | 38 +++++++++++++++++++-------------------
 grocy/build.json | 10 +++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/grocy/Dockerfile b/grocy/Dockerfile
index fe28d10..46204c7 100755
--- a/grocy/Dockerfile
+++ b/grocy/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.2.2
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:10.0.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -9,27 +9,27 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # hadolint ignore=DL3003
 RUN \
     apk add --no-cache \
-        nginx=1.18.0-r15 \
-        patch=2.7.6-r6 \
-        php7-ctype=7.4.19-r0 \
-        php7-exif=7.4.19-r0 \
-        php7-fileinfo=7.4.19-r0 \
-        php7-fpm=7.4.19-r0 \
-        php7-gd=7.4.19-r0 \
-        php7-json=7.4.19-r0 \
-        php7-ldap=7.4.19-r0 \
-        php7-mbstring=7.4.19-r0 \
-        php7-opcache=7.4.19-r0 \
-        php7-pdo_sqlite=7.4.19-r0 \
-        php7-pdo=7.4.19-r0 \
-        php7-simplexml=7.4.19-r0 \
-        php7-tokenizer=7.4.19-r0 \
-        php7=7.4.19-r0 \
+        nginx=1.20.1-r3 \
+        patch=2.7.6-r7 \
+        php7-ctype=7.4.20-r0 \
+        php7-exif=7.4.20-r0 \
+        php7-fileinfo=7.4.20-r0 \
+        php7-fpm=7.4.20-r0 \
+        php7-gd=7.4.20-r0 \
+        php7-json=7.4.20-r0 \
+        php7-ldap=7.4.20-r0 \
+        php7-mbstring=7.4.20-r0 \
+        php7-opcache=7.4.20-r0 \
+        php7-pdo_sqlite=7.4.20-r0 \
+        php7-pdo=7.4.20-r0 \
+        php7-simplexml=7.4.20-r0 \
+        php7-tokenizer=7.4.20-r0 \
+        php7=7.4.20-r0 \
     \
     && apk add --no-cache --virtual .build-dependencies \
-        git=2.30.2-r0 \
+        git=2.32.0-r0 \
         yarn=1.22.10-r0 \
-        composer=2.0.13-r0 \
+        composer=2.1.3-r0 \
     \
     && yarn global add modclean \
     \
diff --git a/grocy/build.json b/grocy/build.json
index 00b1427..9105df8 100755
--- a/grocy/build.json
+++ b/grocy/build.json
@@ -1,9 +1,9 @@
 {
   "build_from": {
-    "aarch64": "ghcr.io/hassio-addons/base/aarch64:9.2.2",
-    "amd64": "ghcr.io/hassio-addons/base/amd64:9.2.2",
-    "armhf": "ghcr.io/hassio-addons/base/armhf:9.2.2",
-    "armv7": "ghcr.io/hassio-addons/base/armv7:9.2.2",
-    "i386": "ghcr.io/hassio-addons/base/i386:9.2.2"
+    "aarch64": "ghcr.io/hassio-addons/base/aarch64:10.0.0",
+    "amd64": "ghcr.io/hassio-addons/base/amd64:10.0.0",
+    "armhf": "ghcr.io/hassio-addons/base/armhf:10.0.0",
+    "armv7": "ghcr.io/hassio-addons/base/armv7:10.0.0",
+    "i386": "ghcr.io/hassio-addons/base/i386:10.0.0"
   }
 }