3 files changed, 23 insertions, 25 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8f56356c..7f0fb4b0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,16 +1,24 @@
 FROM ubuntu:18.04
 
-RUN \
-    apt-get update -qq && \
-    apt-get install -y \
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq \
+    && apt-get install -y \
 # x86_64 / generic packages
-      bash git gosu \
-      cmake make build-essential \
-      wget unzip \
-      python3 python3-pip \ 
+      bash \
+      build-essential \
+      cmake \
+      git \
+      make \
+      python3 \
+      python3-pip \
+      tar \
+      unzip \
+      wget \ 
 # aarch64 packages
-      libffi-dev libssl-dev python3-dev \ 
-    && rm -rf /var/lib/apt/lists/*;
+      libffi-dev \
+      libssl-dev \
+      python3-dev \ 
+    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
 RUN pip3 install adafruit-nrfutil
 
@@ -25,13 +33,10 @@ RUN bash -c "source /opt/build.sh; GetNrfSdk;"
 # McuBoot
 RUN bash -c "source /opt/build.sh; GetMcuBoot;"
 
-# Set and arg and use it in the env for power to override at build AND runtime
-ARG USER_ID=33333
-ARG GROUP_ID=33333
-ENV USER_ID $USER_ID
-ENV GROUP_ID $GROUP_ID
+ARG PUID=1000
+ARG PGID=1000
+RUN groupadd --system --gid $PGID infinitime && useradd --system --uid $PUID --gid $PGID infinitime
 
+USER infinitime:infinitime
 ENV SOURCES_DIR /sources
-COPY entrypoint.sh /opt/
-ENTRYPOINT ["/opt/entrypoint.sh"]
 CMD ["/opt/build.sh"]
diff --git a/docker/build.sh b/docker/build.sh
index 1c697d40..48dd9f33 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -27,7 +27,7 @@ main() {
   mkdir -p "$BUILD_DIR"
 
   CmakeGenerate
-  CmakeBuild "$target"
+  CmakeBuild $target
 
   if [[ "$DISABLE_POSTBUILD" != "true" ]]; then
     source "$BUILD_DIR/post_build.sh"
@@ -67,7 +67,7 @@ CmakeGenerate() {
 CmakeBuild() {
   local target="$1"
   [[ -n "$target" ]] && target="--target $target"
-  cmake --build "$BUILD_DIR" --config $BUILD_TYPE "$target" -- -j$(nproc)
+  cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc)
 }
 
 [[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"
 \ No newline at end of file
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
deleted file mode 100755
index 5adb88f5..00000000
--- a/docker/entrypoint.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-## Create a user on-the-fly before running CMD
-## This allows us to override at runtime, allowing use of a pre-built docker image
-addgroup --gid $GROUP_ID user
-adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID user
-exec gosu user:user /bin/bash -c "$@"
-\ No newline at end of file