From 62563231bad27dc5d69baef4ecf76ffc0c87e38d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20H=C3=A4ussler?= <c-n-i@web.de>
Date: Sun, 10 Dec 2017 23:04:27 +0100
Subject: [PATCH] =?UTF-8?q?Change=20Alpine=20updating=20procedure=20Signed?=
 =?UTF-8?q?-off-by:=20Christian=20H=C3=A4ussler=20<c-n-i@web.de>=20(github?=
 =?UTF-8?q?:=20@cniweb)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 update.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/update.sh b/update.sh
index 05613dc..a07ddd8 100755
--- a/update.sh
+++ b/update.sh
@@ -71,30 +71,26 @@ print_baseimage() {
 	cat >> $1 <<-EOI
 	FROM multiarch/$base_image
 
-	MAINTAINER openHAB <info@openhabfoundation.org>
-
-	# Set download urls
-	ENV JAVA_URL="$java_url"
-	ENV OPENHAB_URL="$openhab_url"
-	ENV OPENHAB_VERSION="$version"
-
 	EOI
 }
 
 # Print metadata
 print_basemetadata() {
 	cat >> $1 <<-'EOI'
-	# Set variables
+	# Set variables and download urls
 	ENV \
 	    APPDIR="/openhab" \
 	    EXTRA_JAVA_OPTS="" \
 	    OPENHAB_HTTP_PORT="8080" \
-	    OPENHAB_HTTPS_PORT="8443"
+	    OPENHAB_HTTPS_PORT="8443" \
+		OPENHAB_URL="$openhab_url" \
+		OPENHAB_VERSION="$version"
 
 	# Basic build-time metadata as defined at http://label-schema.org
-	ARG BUILD_DATE
-	ARG VCS_REF
-	ARG VERSION
+	ARG \
+		BUILD_DATE \
+		VCS_REF \
+		VERSION
 	LABEL org.label-schema.build-date=$BUILD_DATE \
 	    org.label-schema.docker.dockerfile="/Dockerfile" \
 	    org.label-schema.license="EPL" \
@@ -133,7 +129,9 @@ print_basepackages() {
 	    wget \
 	    zip && \
 	    rm -rf /var/lib/apt/lists/*
-	ENV DEBIAN_FRONTEND=noninteractive
+	ENV \
+		DEBIAN_FRONTEND=noninteractive \
+		JAVA_URL="$java_url"
 
 EOI
 }
@@ -142,7 +140,9 @@ EOI
 print_basepackages_alpine() {
 	cat >> $1 <<-'EOI'
 	# Install basepackages
-	RUN apk update && apk add \
+	RUN apk update && \
+    	apk upgrade && \
+    	apk add --no-cache \
 	    ca-certificates \
 	    fontconfig \
 	    ttf-dejavu \