From 747edf98fe9666462fe8ed147a72a7cac885e1b2 Mon Sep 17 00:00:00 2001
From: Andre <info@buanet.de>
Date: Mon, 28 Oct 2019 10:12:46 +0100
Subject: [PATCH] updating prerequisites

---
 amd64/Dockerfile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index bc1b165..01cd5b5 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Andre Germann <https://buanet.de>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install prerequisites
+# Install prerequisites (as listed in iobroker installer.sh)
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
         acl \
         apt-utils \
@@ -12,17 +12,20 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
         curl \
         git \
         gnupg2 \
+	gosu \
+	libavahi-compat-libdnssd-dev \
         libcap2-bin \
         libpam0g-dev \
         libudev-dev \
         locales \
-        procps \
+	pkg-config \
         python \
-        gosu \
+	python-dev \
+	sudo \
         unzip \
         wget \
     && rm -rf /var/lib/apt/lists/*
-
+    
 # Install node10
 RUN curl -sL https://deb.nodesource.com/setup_10.x | bash \
     && apt-get update && apt-get install -y \
@@ -61,8 +64,9 @@ RUN npm install -g node-gyp
 # Backup initial ioBroker-folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker
 
-# Setting up iobroker-user
-RUN chsh -s /bin/bash iobroker
+# Setting up iobroker-user (shell and home directory)
+RUN chsh -s /bin/bash iobroker \
+    && usermod --home /opt/iobroker iobroker
 
 # Setting up ENVs
 ENV DEBIAN_FRONTEND="teletype" \
@@ -70,10 +74,10 @@ ENV DEBIAN_FRONTEND="teletype" \
 	LANGUAGE="de_DE:de" \
 	LC_ALL="de_DE.UTF-8" \
 	TZ="Europe/Berlin" \
-	PACKAGES="nano" \
+	PACKAGES="vi" \
 	AVAHI="false" \
-    SETUID=1000 \
-    SETGID=1000 \
+	SETUID=1000 \
+	SETGID=1000 \
 	ZWAVE="false"
 
 # Setting up EXPOSE for Admin