From f89b88315610ee5c68af71184ba2b8950be5ece0 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Wed, 18 Aug 2021 16:55:05 +0200 Subject: [PATCH] Revert "Revert "Dockerfile: use relative paths when in the /home/linuxbrew directory"" This reverts commit 6d61fb03cd0da78b41dc0d66663a6e3abf224276. --- Dockerfile | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index b432656c18..99cecbe7db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,15 +37,22 @@ COPY --chown=linuxbrew:linuxbrew . /home/linuxbrew/.linuxbrew/Homebrew ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH WORKDIR /home/linuxbrew -# hadolint ignore=DL3003 -RUN cd /home/linuxbrew/.linuxbrew \ - && mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar \ - && ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin/ \ - && git -C /home/linuxbrew/.linuxbrew/Homebrew remote set-url origin https://github.com/Homebrew/brew \ - && git -C /home/linuxbrew/.linuxbrew/Homebrew fetch origin \ +RUN mkdir -p \ + .linuxbrew/bin \ + .linuxbrew/etc \ + .linuxbrew/include \ + .linuxbrew/lib \ + .linuxbrew/opt \ + .linuxbrew/sbin \ + .linuxbrew/share \ + .linuxbrew/var/homebrew/linked \ + .linuxbrew/Cellar \ + && ln -s ../Homebrew/bin/brew .linuxbrew/bin/brew \ + && git -C .linuxbrew/Homebrew remote set-url origin https://github.com/Homebrew/brew \ + && git -C .linuxbrew/Homebrew fetch origin \ && HOMEBREW_NO_ANALYTICS=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/core \ && brew install-bundler-gems \ && brew cleanup \ - && { git -C /home/linuxbrew/.linuxbrew/Homebrew config --unset gc.auto; true; } \ - && { git -C /home/linuxbrew/.linuxbrew/Homebrew config --unset homebrew.devcmdrun; true; } \ - && rm -rf ~/.cache + && { git -C .linuxbrew/Homebrew config --unset gc.auto; true; } \ + && { git -C .linuxbrew/Homebrew config --unset homebrew.devcmdrun; true; } \ + && rm -rf .cache