diff --git a/Makefile b/Makefile index 9cb9524..3850436 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ SOURCE_DIRECTORY:=${ROOT_DIR} ADORE_CLI_WORKING_DIRECTORY:=${ROOT_DIR} CATKIN_WORKSPACE_DIRECTORY:=${SOURCE_DIRECTORY}/catkin_workspace +DOCKER_CONFIG= + include adore_cli.mk include ${ADORE_CLI_SUBMODULES_PATH}/ci_teststand/ci_teststand.mk diff --git a/docker/Dockerfile.adore_cli b/docker/Dockerfile.adore_cli index 3519f0f..11e63eb 100644 --- a/docker/Dockerfile.adore_cli +++ b/docker/Dockerfile.adore_cli @@ -33,15 +33,17 @@ RUN chown -R ${UID}:${GID} $$HOME | true ARG ZSH_CUSTOM=/home/${USER}/.oh-my-zsh/custom +RUN chown ${USER}:${USER} /home/${USER} -R USER root RUN apt-get update && \ apt-get install --no-install-recommends -y zsh git curl && \ rm -rf /var/lib/apt/lists/* + USER ${USER} WORKDIR /home/${USER} -RUN zsh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" +RUN zsh -c "$(curl -fsSL sh https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"