From c121f99cd318a053c43fa324698df16559526b8d Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Thu, 18 Apr 2019 22:51:24 +0200
Subject: [PATCH] :arrow_up: Upgrades base image to Python 1.1.0

---
 .gitlab-ci.yml           | 10 +++++-----
 glances/Dockerfile       |  6 +-----
 glances/build.json       | 10 +++++-----
 glances/requirements.txt |  2 ++
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 11d5758..ffa5e02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ variables:
 
   ADDON_LEGACY_TAGS: "true"
 
-  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:3.0.1"
-  ADDON_AMD64_BASE: "hassioaddons/base-amd64:3.0.1"
-  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:3.0.1"
-  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:3.0.1"
-  ADDON_I386_BASE: "hassioaddons/base-i386:3.0.1"
+  ADDON_AARCH64_base-python: "hassioaddons/base-aarch64:1.1.0"
+  ADDON_AMD64_base-python: "hassioaddons/base-amd64:1.1.0"
+  ADDON_ARMHF_base-python: "hassioaddons/base-armhf:1.1.0"
+  ADDON_ARMV7_base-python: "hassioaddons/base-armv7:1.1.0"
+  ADDON_I386_base-python: "hassioaddons/base-i386:1.1.0"
diff --git a/glances/Dockerfile b/glances/Dockerfile
index 4100523..6f8727a 100755
--- a/glances/Dockerfile
+++ b/glances/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:3.0.1
+ARG BUILD_FROM=hassioaddons/base-python:1.1.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -15,15 +15,11 @@ RUN \
         gcc=8.2.0-r2 \
         linux-headers=4.18.13-r1 \
         musl-dev=1.1.20-r4 \
-        python3-dev=3.6.8-r1 \
     \
     && apk add --no-cache \
         lua-resty-http=0.12-r1 \
         nginx-mod-http-lua=1.14.2-r0 \
         nginx=1.14.2-r0 \
-        py3-bottle=0.12.13-r2 \
-        py3-psutil=5.5.0-r0 \
-        python3=3.6.8-r1 \
     \
     && pip3 install --no-cache-dir -r /tmp/requirements.txt \
     \
diff --git a/glances/build.json b/glances/build.json
index 7ceed1b..bdde33d 100644
--- a/glances/build.json
+++ b/glances/build.json
@@ -1,10 +1,10 @@
 {
     "build_from": {
-        "aarch64": "hassioaddons/base-aarch64:3.0.1",
-        "amd64": "hassioaddons/base-amd64:3.0.1",
-        "armhf": "hassioaddons/base-armhf:3.0.1",
-        "armv7": "hassioaddons/base-armv7:3.0.1",
-        "i386": "hassioaddons/base-i386:3.0.1"
+        "aarch64": "hassioaddons/base-python-aarch64:1.1.0",
+        "amd64": "hassioaddons/base-python-amd64:1.1.0",
+        "armhf": "hassioaddons/base-python-armhf:1.1.0",
+        "armv7": "hassioaddons/base-python-armv7:1.1.0",
+        "i386": "hassioaddons/base-python-i386:1.1.0"
     },
     "args": {}
 }
diff --git a/glances/requirements.txt b/glances/requirements.txt
index 0b95f61..1db6250 100644
--- a/glances/requirements.txt
+++ b/glances/requirements.txt
@@ -1,8 +1,10 @@
+bottle==0.12.16
 docker==3.7.2
 glances==3.1.0
 influxdb==5.2.2
 netifaces==0.10.9
 paho-mqtt==1.4.0
+psutil==5.6.1
 py-cpuinfo==5.0.0
 requests==2.21.0
 scandir==1.10.0