Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -13,14 +13,15 @@ RUN echo "$USER ALL=(ALL) NOPASSWD: ALL" \
|
|||||||
>>/etc/sudoers
|
>>/etc/sudoers
|
||||||
|
|
||||||
# Filesystem steps
|
# Filesystem steps
|
||||||
|
RUN rm /home/$USER/.profile /home/$USER/.bashrc
|
||||||
ENV WORKSPACE="/home/$USER/workspace"
|
ENV WORKSPACE="/home/$USER/workspace"
|
||||||
ENV LOG_TARGET="STDOUT"
|
|
||||||
ADD --chown=test-user . "$WORKSPACE/dotfiles"
|
ADD --chown=test-user . "$WORKSPACE/dotfiles"
|
||||||
WORKDIR "$WORKSPACE/dotfiles"
|
WORKDIR "$WORKSPACE/dotfiles"
|
||||||
|
|
||||||
# Install steps
|
# Install steps
|
||||||
USER test-user
|
USER test-user
|
||||||
ARG TARGET="all"
|
ARG TARGET="all"
|
||||||
|
ENV LOG_TARGET="STDOUT"
|
||||||
RUN make install TARGET=$TARGET
|
RUN make install TARGET=$TARGET
|
||||||
|
|
||||||
# Test entrypoint
|
# Test entrypoint
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
if [ -z "$PROFILE_LOCK" ]; then
|
if [ -z "$PROFILE_LOCK" ]; then
|
||||||
export PROFILE_LOCK=1
|
export PROFILE_LOCK=1
|
||||||
|
|
||||||
# set PATH so it includes user's private bin if it exists
|
# set PATH so it includes user's private bin
|
||||||
if [ -d "$HOME/bin" ]; then
|
|
||||||
export PATH="$HOME/bin:$PATH"
|
export PATH="$HOME/bin:$PATH"
|
||||||
fi
|
|
||||||
if [ -d "$HOME/.local/bin" ]; then
|
|
||||||
export PATH="$HOME/.local/bin:$PATH"
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
fi
|
|
||||||
|
|
||||||
# config
|
# config
|
||||||
if [ -z "$XDG_DATA_HOME" ]; then
|
if [ -z "$XDG_DATA_HOME" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user