From 6d61fb03cd0da78b41dc0d66663a6e3abf224276 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Wed, 18 Aug 2021 12:39:05 +0200 Subject: [PATCH] Revert "Dockerfile: use relative paths when in the /home/linuxbrew directory" This reverts commit 65a755a16079ee4fc507d95de0e8725bb05621f0. --- Dockerfile | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99cecbe7db..b432656c18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,22 +37,15 @@ COPY --chown=linuxbrew:linuxbrew . /home/linuxbrew/.linuxbrew/Homebrew ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH WORKDIR /home/linuxbrew -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 \ +# 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 \ && HOMEBREW_NO_ANALYTICS=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/core \ && brew install-bundler-gems \ && brew cleanup \ - && { git -C .linuxbrew/Homebrew config --unset gc.auto; true; } \ - && { git -C .linuxbrew/Homebrew config --unset homebrew.devcmdrun; true; } \ - && rm -rf .cache + && { 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