From 2036e289bcc73f632fde388803acce8bc0f89b95 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Tue, 19 Jul 2022 01:04:16 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on=20base?=
 =?UTF-8?q?=20image=20to=2012.2.1=20(#269)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⬆️ Upgrades add-on base image to 12.2.1

* Clean up Dockerfile with new base image features
---
 glances/Dockerfile | 18 +++++-------------
 glances/build.yaml | 10 +++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/glances/Dockerfile b/glances/Dockerfile
index d2241fa..b766940 100755
--- a/glances/Dockerfile
+++ b/glances/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/base:12.2.1
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -9,24 +9,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 COPY requirements.txt /tmp/
 
 # Setup base
-ARG BUILD_ARCH=amd64
+# hadolint ignore=DL3042
 RUN \
     apk add --no-cache --virtual .build-dependencies \
-        automake=1.16.5-r0 \
-        build-base=0.5-r2 \
-        linux-headers=5.16.7-r1 \
-        python3-dev=3.10.4-r0 \
+        py3-pip=22.1.1-r0 \
     \
     && apk add --no-cache \
-        nginx=1.22.0-r0 \
-        py3-pip=22.1.1-r0 \
+        nginx=1.22.0-r1 \
         python3=3.10.4-r0 \
     \
-    && pip3 install \
-        --no-cache-dir \
-        --prefer-binary \
-        --find-links "https://wheels.home-assistant.io/alpine-3.16/${BUILD_ARCH}/" \
-        -r /tmp/requirements.txt \
+    && pip3 install -r /tmp/requirements.txt \
     \
     && find /usr/local \
         \( -type d -a -name test -o -name tests -o -name '__pycache__' \) \
diff --git a/glances/build.yaml b/glances/build.yaml
index 9f7b211..808a222 100644
--- a/glances/build.yaml
+++ b/glances/build.yaml
@@ -1,10 +1,10 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
-  amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
-  armhf: ghcr.io/hassio-addons/base/armhf:12.0.0
-  armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
-  i386: ghcr.io/hassio-addons/base/i386:12.0.0
+  aarch64: ghcr.io/hassio-addons/base:12.2.1
+  amd64: ghcr.io/hassio-addons/base:12.2.1
+  armhf: ghcr.io/hassio-addons/base:12.2.1
+  armv7: ghcr.io/hassio-addons/base:12.2.1
+  i386: ghcr.io/hassio-addons/base:12.2.1
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev