From edce09a0d110d5349c5e969216a7c49e2cf7f21d Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Sun, 24 Jan 2021 20:01:02 +0100 Subject: [PATCH] Upgrade add-on base image to 9.1.0 (#96) * Upgrade add-on base image to 9.1.0 * Adjust upstream wheels repository --- glances/Dockerfile | 22 +++++++++++----------- glances/build.json | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/glances/Dockerfile b/glances/Dockerfile index 7c8427c..9559aac 100755 --- a/glances/Dockerfile +++ b/glances/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/base:8.0.5 +ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.1.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -12,23 +12,23 @@ COPY requirements.txt /tmp/ ARG BUILD_ARCH=amd64 RUN \ apk add --no-cache --virtual .build-dependencies \ - automake=1.16.2-r0 \ - gcc=9.3.0-r2 \ - linux-headers=5.4.5-r1 \ - musl-dev=1.1.24-r9 \ - python3-dev=3.8.5-r0 \ + automake=1.16.3-r0 \ + gcc=10.2.1_pre1-r3 \ + linux-headers=5.7.8-r0 \ + musl-dev=1.2.2-r0 \ + python3-dev=3.8.7-r0 \ \ && apk add --no-cache \ lua-resty-http=0.15-r0 \ - nginx-mod-http-lua=1.18.0-r1 \ - nginx=1.18.0-r1 \ - py3-pip=20.1.1-r0 \ - python3=3.8.5-r0 \ + nginx-mod-http-lua=1.18.0-r13 \ + nginx=1.18.0-r13 \ + py3-pip=20.3.3-r0 \ + python3=3.8.7-r0 \ \ && pip3 install \ --no-cache-dir \ --prefer-binary \ - --find-links "https://wheels.home-assistant.io/alpine-3.12/${BUILD_ARCH}/" \ + --find-links "https://wheels.home-assistant.io/alpine-3.13/${BUILD_ARCH}/" \ -r /tmp/requirements.txt \ \ && find /usr/local \ diff --git a/glances/build.json b/glances/build.json index c1c900e..07898b0 100644 --- a/glances/build.json +++ b/glances/build.json @@ -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.1.0", + "amd64": "ghcr.io/hassio-addons/base/amd64:9.1.0", + "armhf": "ghcr.io/hassio-addons/base/armhf:9.1.0", + "armv7": "ghcr.io/hassio-addons/base/armv7:9.1.0", + "i386": "ghcr.io/hassio-addons/base/i386:9.1.0" } }