⬆️ Upgrades add-on base image to v7.0.2

This commit is contained in:
Franck Nijhof 2020-02-27 02:48:02 +01:00
parent c9a30e2c63
commit a9ad1eb337
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
3 changed files with 22 additions and 22 deletions

View file

@ -8,8 +8,8 @@ variables:
ADDON_LEGACY_TAGS: "true"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:4.1.1"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:4.1.1"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:4.1.1"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:4.1.1"
ADDON_I386_BASE: "hassioaddons/base-i386:4.1.1"
ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:7.0.1"
ADDON_AMD64_BASE: "hassioaddons/base-amd64:7.0.1"
ADDON_ARMHF_BASE: "hassioaddons/base-armhf:7.0.1"
ADDON_ARMV7_BASE: "hassioaddons/base-armv7:7.0.1"
ADDON_I386_BASE: "hassioaddons/base-i386:7.0.1"

View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:4.1.1
ARG BUILD_FROM=hassioaddons/base:7.0.1
# hadolint ignore=DL3006
FROM ${BUILD_FROM}
@ -17,16 +17,16 @@ ENV HIVEMQ='b2043e7fcbd5897a3799869d42c6202122221fbc' \
# hadolint ignore=DL3003
RUN \
apk add --no-cache --virtual .build-dependencies \
git=2.22.0-r0 \
cmake=3.14.5-r0 \
git=2.24.1-r0 \
cmake=3.15.5-r0 \
build-base=0.5-r1 \
zlib-dev=1.2.11-r1 \
openssl-dev=1.1.1c-r0 \
zlib-dev=1.2.11-r3 \
openssl-dev=1.1.1d-r3 \
\
&& apk add --no-cache \
nginx=1.16.1-r0 \
lua-resty-http=0.13-r0 \
nginx-mod-http-lua=1.16.1-r0 \
nginx=1.16.1-r6 \
lua-resty-http=0.15-r0 \
nginx-mod-http-lua=1.16.1-r6 \
\
&& git clone --depth=1 \
https://github.com/hivemq/hivemq-mqtt-web-client.git /app \

View file

@ -1,11 +1,11 @@
{
"args": {},
"build_from": {
"aarch64": "hassioaddons/base-aarch64:4.1.1",
"amd64": "hassioaddons/base-amd64:4.1.1",
"armhf": "hassioaddons/base-armhf:4.1.1",
"armv7": "hassioaddons/base-armv7:4.1.1",
"i386": "hassioaddons/base-i386:4.1.1"
},
"squash": false
"args": {},
"build_from": {
"aarch64": "hassioaddons/base-aarch64:7.0.1",
"amd64": "hassioaddons/base-amd64:7.0.1",
"armhf": "hassioaddons/base-armhf:7.0.1",
"armv7": "hassioaddons/base-armv7:7.0.1",
"i386": "hassioaddons/base-i386:7.0.1"
},
"squash": false
}