From 785f3ab4643bb0bb64b5ff6dd8c4c46a9e8c6c98 Mon Sep 17 00:00:00 2001 From: Issy Long Date: Sun, 26 Apr 2020 09:55:14 +0100 Subject: [PATCH] Dockerfile: Tabs to spaces - My editor converted some of these to spaces when I changed the lines in the previous commit. We should be consistent, so I made all of them into spaces. --- Dockerfile | 64 +++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 89c783bb47..5fdf78e43c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,49 +3,49 @@ LABEL maintainer="Shaun Jackman " # hadolint ignore=DL3008 RUN apt-get update \ - && apt-get install -y --no-install-recommends software-properties-common \ - && add-apt-repository -y ppa:git-core/ppa \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - bzip2 \ - ca-certificates \ - curl \ - file \ - fonts-dejavu-core \ - g++ \ - git \ - libz-dev \ - locales \ - make \ - netbase \ - openssh-client \ - patch \ - sudo \ - uuid-runtime \ - tzdata \ - && rm -rf /var/lib/apt/lists/* + && apt-get install -y --no-install-recommends software-properties-common \ + && add-apt-repository -y ppa:git-core/ppa \ + && apt-get update \ + && apt-get install -y --no-install-recommends \ + bzip2 \ + ca-certificates \ + curl \ + file \ + fonts-dejavu-core \ + g++ \ + git \ + libz-dev \ + locales \ + make \ + netbase \ + openssh-client \ + patch \ + sudo \ + uuid-runtime \ + tzdata \ + && rm -rf /var/lib/apt/lists/* RUN localedef -i en_US -f UTF-8 en_US.UTF-8 \ - && useradd -m -s /bin/bash linuxbrew \ - && echo 'linuxbrew ALL=(ALL) NOPASSWD:ALL' >>/etc/sudoers + && useradd -m -s /bin/bash linuxbrew \ + && echo 'linuxbrew ALL=(ALL) NOPASSWD:ALL' >>/etc/sudoers COPY . /home/linuxbrew/.linuxbrew/Homebrew ARG FORCE_REBUILD # 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/ \ - && cd /home/linuxbrew/.linuxbrew/Homebrew \ - && git remote set-url origin https://github.com/Homebrew/brew + && ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin/ \ + && cd /home/linuxbrew/.linuxbrew/Homebrew \ + && git remote set-url origin https://github.com/Homebrew/brew WORKDIR /home/linuxbrew ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH \ - SHELL=/bin/bash + SHELL=/bin/bash # Install portable-ruby, tap homebrew/core, install audit gems, and cleanup RUN HOMEBREW_NO_ANALYTICS=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/core \ - && chown -R linuxbrew: /home/linuxbrew/.linuxbrew \ - && chmod -R g+w,o-w /home/linuxbrew/.linuxbrew \ - && rm -rf ~/.cache \ - && brew install-bundler-gems \ - && brew cleanup + && chown -R linuxbrew: /home/linuxbrew/.linuxbrew \ + && chmod -R g+w,o-w /home/linuxbrew/.linuxbrew \ + && rm -rf ~/.cache \ + && brew install-bundler-gems \ + && brew cleanup