hassio-addons/addon-glances
1
0
Fork 0
mirror of https://github.com/hassio-addons/addon-glances.git synced 2025-05-05 11:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

⬆️ Upgrades base image to Python 1.1.0

Browse source
This commit is contained in:
Franck Nijhof 2019-04-18 22:51:24 +02:00
parent c7cc71dd31
commit c121f99cd3
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -8,8 +8,8 @@ variables:
ADDON_LEGACY_TAGS: "true" ADDON_LEGACY_TAGS: "true"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:3.0.1" ADDON_AARCH64_base-python: "hassioaddons/base-aarch64:1.1.0"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:3.0.1" ADDON_AMD64_base-python: "hassioaddons/base-amd64:1.1.0"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:3.0.1" ADDON_ARMHF_base-python: "hassioaddons/base-armhf:1.1.0"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:3.0.1" ADDON_ARMV7_base-python: "hassioaddons/base-armv7:1.1.0"
ADDON_I386_BASE: "hassioaddons/base-i386:3.0.1" ADDON_I386_base-python: "hassioaddons/base-i386:1.1.0"

6
glances/Dockerfile
View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:3.0.1 ARG BUILD_FROM=hassioaddons/base-python:1.1.0
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
@ -15,15 +15,11 @@ RUN \
gcc=8.2.0-r2 \ gcc=8.2.0-r2 \
linux-headers=4.18.13-r1 \ linux-headers=4.18.13-r1 \
musl-dev=1.1.20-r4 \ musl-dev=1.1.20-r4 \
python3-dev=3.6.8-r1 \
\ \
&& apk add --no-cache \ && apk add --no-cache \
lua-resty-http=0.12-r1 \ lua-resty-http=0.12-r1 \
nginx-mod-http-lua=1.14.2-r0 \ nginx-mod-http-lua=1.14.2-r0 \
nginx=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 \ && pip3 install --no-cache-dir -r /tmp/requirements.txt \
\ \

10
glances/build.json
View file

@ -1,10 +1,10 @@
{ {
"build_from": { "build_from": {
"aarch64": "hassioaddons/base-aarch64:3.0.1", "aarch64": "hassioaddons/base-python-aarch64:1.1.0",
"amd64": "hassioaddons/base-amd64:3.0.1", "amd64": "hassioaddons/base-python-amd64:1.1.0",
"armhf": "hassioaddons/base-armhf:3.0.1", "armhf": "hassioaddons/base-python-armhf:1.1.0",
"armv7": "hassioaddons/base-armv7:3.0.1", "armv7": "hassioaddons/base-python-armv7:1.1.0",
"i386": "hassioaddons/base-i386:3.0.1" "i386": "hassioaddons/base-python-i386:1.1.0"
}, },
"args": {} "args": {}
} }

2
glances/requirements.txt
View file

@ -1,8 +1,10 @@
bottle==0.12.16
docker==3.7.2 docker==3.7.2
glances==3.1.0 glances==3.1.0
influxdb==5.2.2 influxdb==5.2.2
netifaces==0.10.9 netifaces==0.10.9
paho-mqtt==1.4.0 paho-mqtt==1.4.0
psutil==5.6.1
py-cpuinfo==5.0.0 py-cpuinfo==5.0.0
requests==2.21.0 requests==2.21.0
scandir==1.10.0 scandir==1.10.0