Merge remote-tracking branch 'origin/master'

Dockerfile

@@ -13,14 +13,15 @@ RUN echo "$USER ALL=(ALL) NOPASSWD: ALL" \
     >>/etc/sudoers
 
 # Filesystem steps
+RUN rm /home/$USER/.profile /home/$USER/.bashrc
 ENV WORKSPACE="/home/$USER/workspace"
-ENV LOG_TARGET="STDOUT"
 ADD --chown=test-user . "$WORKSPACE/dotfiles"
 WORKDIR "$WORKSPACE/dotfiles"
 
 # Install steps
 USER test-user
 ARG TARGET="all"
+ENV LOG_TARGET="STDOUT"
 RUN make install TARGET=$TARGET
 
 # Test entrypoint

files/.profile

@@ -1,13 +1,9 @@
 if [ -z "$PROFILE_LOCK" ]; then
     export PROFILE_LOCK=1
 
-    # set PATH so it includes user's private bin if it exists
-    if [ -d "$HOME/bin" ]; then
+    # set PATH so it includes user's private bin
     export PATH="$HOME/bin:$PATH"
-    fi
-    if [ -d "$HOME/.local/bin" ]; then
     export PATH="$HOME/.local/bin:$PATH"
-    fi
 
     # config
     if [ -z "$XDG_DATA_HOME" ]; then