From 9d21a0daa4749b1662080eb1442ff81507060bab Mon Sep 17 00:00:00 2001
From: Pete Johanson <peter@peterjohanson.com>
Date: Mon, 11 May 2020 11:09:10 -0400
Subject: [PATCH] Docker tweaks.

---
 Dockerfile | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c89fbc1..17fa1cd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ RUN apt-get -y update && \
 	apt-get -y upgrade && \
 	apt-get install --no-install-recommends -y \
 	wget \
-	gnupg \
 	ca-certificates \
 	autoconf \
 	automake \
@@ -16,21 +15,16 @@ RUN apt-get -y update && \
 	g++ \
 	gcc \
 	gcc-multilib \
-	gcovr \
 	git \
-	git-core \
 	iproute2 \
 	libpcap-dev \
 	libtool \
 	locales \
 	make \
-	net-tools \
 	ninja-build \
 	python3-dev \
 	python3-pip \
-	python3-ply \
 	python3-setuptools \
-	python-xdg \
 	xz-utils && \
 	rm -rf /var/lib/apt/lists/*
 
@@ -45,9 +39,6 @@ RUN wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}
 	./cmake-${CMAKE_VERSION}-Linux-x86_64.sh --skip-license --prefix=/usr/local && \
 	rm -f ./cmake-${CMAKE_VERSION}-Linux-x86_64.sh
 
-ARG UID=1000
-ARG GID=1000
-
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN locale-gen en_US.UTF-8
@@ -61,21 +52,13 @@ RUN wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/s
 	wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-doc.txt && \
 	wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-run-test.txt && \
 	wget -q https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/master/scripts/requirements-extras.txt && \
-	pip3 install wheel &&\
+	pip3 install wheel && \
 	pip3 install -r requirements.txt && \
-	pip3 install west &&\
+	pip3 install west && \
 	pip3 install sh
 
-RUN groupadd -g $GID -o user
-RUN useradd -u $UID -m -g user user
-
 # Set the locale
 ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 ENV ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZSDK_VERSION}
-ENV ZEPHYR_BASE=/workdir
-
-RUN chown -R user:user /home/user
 
 CMD ["/bin/bash"]
-USER user
-WORKDIR /workdir