add gosu and net-tools to base ubuntu image, refactor to not change to box user

Author: psviderski

poetry/Dockerfile

@@ -2,6 +2,8 @@ FROM rootnroll/demo-ubuntu:18.04
 LABEL maintainer "Pavel Sviderski <[email protected]>"
 
 ENV POETRY_VERSION 0.12.7
+USER box
+WORKDIR /home/box
 
 # Create a virtualenv for poetry to force it to use Python 3
 RUN python3 -m venv ~/.virtualenvs/poetry \

ubuntu/18.04/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 LABEL maintainer "Pavel Sviderski <[email protected]>"
 
 RUN apt-get update && apt-get --no-install-recommends -y install \
-    sudo man less locales gnupg2 vim nano screen tmux ca-certificates curl wget \
+    sudo man less locales gnupg2 vim nano screen tmux ca-certificates curl wget net-tools \
     git rsync \
     python3 python3-pip python3-venv \
     # Add fish-shell repo and install fish, gnupg2 is required for apt-key
@@ -15,16 +15,18 @@ RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
-ENV SHELL /usr/bin/fish
+
+ENV GOSU_VERSION 1.11
+RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-amd64" \
+    && chmod +x /usr/local/bin/gosu
 
 RUN useradd -m box -s /usr/bin/fish \
     && echo "box ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/box
-USER box
-WORKDIR /home/box
 
 # Install fisher package manager and configure the Powerline-style bobthefish theme
-RUN curl -Lo ~/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher \
-    && fish -c "fisher add oh-my-fish/theme-bobthefish"
-COPY --chown=box:box config.fish .config/fish/
+RUN gosu box curl -Lo /home/box/.config/fish/functions/fisher.fish --create-dirs https://git.io/fisher \
+    && gosu box fish -c "fisher add oh-my-fish/theme-bobthefish"
+COPY --chown=box:box config.fish /home/box/.config/fish/
+ENV SHELL /usr/bin/fish
 
 CMD ["/usr/bin/fish", "-l"]