diff --git a/images/rafnav_bench/Dockerfile b/images/rafnav_bench/Dockerfile index c98ffd1f..1b0f6fa5 100644 --- a/images/rafnav_bench/Dockerfile +++ b/images/rafnav_bench/Dockerfile @@ -122,12 +122,11 @@ RUN git clone ${GIT_REPO} --depth 1 -b ${GIT_BRANCH} .bench \ && echo "export PATH=/home/frappe/.local/bin:\$PATH" >>/home/frappe/.bashrc \ && echo "export BENCH_DEVELOPER=1" >>/home/frappe/.bashrc -# Install homebrew and wget -RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" \ - && (echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/frappe/.profile \ - && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" \ - && brew install gcc \ - && brew install wget +# Setup GitHub Credential Manager +RUN wget "https://github.com/git-ecosystem/git-credential-manager/releases/download/v2.5.0/gcm-linux_amd64.2.5.0.deb" -O /tmp/gcmcore.deb \ + && sudo dpkg -i /tmp/gcmcore.deb \ + && git-credential-manager configure + # Add aliases RUN touch ~/.bash_aliases \ @@ -155,8 +154,12 @@ RUN wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | && echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' >> ~/.bashrc \ && echo '[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> ~/.bashrc + EXPOSE 8000-8005 9000-9005 6787 +RUN (echo; echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"') >> /home/frappe/.profile \ + && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" + FROM bench as bench-test # Print version and verify bashrc is properly sourced so that everything works