From 0df0dcbee9e0200c77d04d0cf8fbdc52a66a0945 Mon Sep 17 00:00:00 2001 From: Timmo Date: Sun, 29 Dec 2019 14:50:33 +0000 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=20Upgrade=20base=20image=20to=20v6.0.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 10 +++++----- home-panel/Dockerfile | 12 ++++++------ home-panel/build.json | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bae15c..ddf68a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,8 @@ variables: ADDON_LEGACY_TAGS: "true" - ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:5.0.1" - ADDON_AMD64_BASE: "hassioaddons/base-amd64:5.0.1" - ADDON_ARMHF_BASE: "hassioaddons/base-armhf:5.0.1" - ADDON_ARMV7_BASE: "hassioaddons/base-armv7:5.0.1" - ADDON_I386_BASE: "hassioaddons/base-i386:5.0.1" + ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:6.0.1" + ADDON_AMD64_BASE: "hassioaddons/base-amd64:6.0.1" + ADDON_ARMHF_BASE: "hassioaddons/base-armhf:6.0.1" + ADDON_ARMV7_BASE: "hassioaddons/base-armv7:6.0.1" + ADDON_I386_BASE: "hassioaddons/base-i386:6.0.1" diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile index e5619eb..b515a5b 100644 --- a/home-panel/Dockerfile +++ b/home-panel/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=hassioaddons/base:5.0.1 +ARG BUILD_FROM=hassioaddons/base:6.0.1 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -9,13 +9,13 @@ COPY rootfs / # hadolint ignore=DL3003 RUN \ apk add --no-cache --virtual .build-dependencies \ - git=2.22.2-r0 \ - yarn=1.16.0-r0 \ + git=2.24.1-r0 \ + yarn=1.19.2-r0 \ \ && apk add --no-cache \ - nginx=1.16.1-r1 \ - nodejs-current=12.4.0-r0 \ - openssl=1.1.1d-r0 \ + nginx=1.16.1-r4 \ + nodejs-current=13.1.0-r0 \ + openssl=1.1.1d-r3 \ \ && git clone --branch "v2.4.10" --depth=1 \ "https://github.com/timmo001/home-panel.git" /tmp/api \ diff --git a/home-panel/build.json b/home-panel/build.json index 275655a..dafa41a 100644 --- a/home-panel/build.json +++ b/home-panel/build.json @@ -1,11 +1,11 @@ { "args": {}, "build_from": { - "aarch64": "hassioaddons/base-aarch64:5.0.1", - "amd64": "hassioaddons/base-amd64:5.0.1", - "armhf": "hassioaddons/base-armhf:5.0.1", - "armv7": "hassioaddons/base-armv7:5.0.1", - "i386": "hassioaddons/base-i386:5.0.1" + "aarch64": "hassioaddons/base-aarch64:6.0.1", + "amd64": "hassioaddons/base-amd64:6.0.1", + "armhf": "hassioaddons/base-armhf:6.0.1", + "armv7": "hassioaddons/base-armv7:6.0.1", + "i386": "hassioaddons/base-i386:6.0.1" }, "squash": false }