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.
This commit is contained in:
Issy Long 2020-04-26 09:55:14 +01:00
parent 9baebbe38a
commit 785f3ab464
No known key found for this signature in database
GPG Key ID: 8247C390DADC67D4

View File

@ -3,49 +3,49 @@ LABEL maintainer="Shaun Jackman <sjackman@gmail.com>"
# hadolint ignore=DL3008 # hadolint ignore=DL3008
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends software-properties-common \ && apt-get install -y --no-install-recommends software-properties-common \
&& add-apt-repository -y ppa:git-core/ppa \ && add-apt-repository -y ppa:git-core/ppa \
&& apt-get update \ && apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
bzip2 \ bzip2 \
ca-certificates \ ca-certificates \
curl \ curl \
file \ file \
fonts-dejavu-core \ fonts-dejavu-core \
g++ \ g++ \
git \ git \
libz-dev \ libz-dev \
locales \ locales \
make \ make \
netbase \ netbase \
openssh-client \ openssh-client \
patch \ patch \
sudo \ sudo \
uuid-runtime \ uuid-runtime \
tzdata \ tzdata \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN localedef -i en_US -f UTF-8 en_US.UTF-8 \ RUN localedef -i en_US -f UTF-8 en_US.UTF-8 \
&& useradd -m -s /bin/bash linuxbrew \ && useradd -m -s /bin/bash linuxbrew \
&& echo 'linuxbrew ALL=(ALL) NOPASSWD:ALL' >>/etc/sudoers && echo 'linuxbrew ALL=(ALL) NOPASSWD:ALL' >>/etc/sudoers
COPY . /home/linuxbrew/.linuxbrew/Homebrew COPY . /home/linuxbrew/.linuxbrew/Homebrew
ARG FORCE_REBUILD ARG FORCE_REBUILD
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN cd /home/linuxbrew/.linuxbrew \ RUN cd /home/linuxbrew/.linuxbrew \
&& mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar \ && mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar \
&& ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin/ \ && ln -s ../Homebrew/bin/brew /home/linuxbrew/.linuxbrew/bin/ \
&& cd /home/linuxbrew/.linuxbrew/Homebrew \ && cd /home/linuxbrew/.linuxbrew/Homebrew \
&& git remote set-url origin https://github.com/Homebrew/brew && git remote set-url origin https://github.com/Homebrew/brew
WORKDIR /home/linuxbrew WORKDIR /home/linuxbrew
ENV PATH=/home/linuxbrew/.linuxbrew/bin:/home/linuxbrew/.linuxbrew/sbin:$PATH \ 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 # 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 \ RUN HOMEBREW_NO_ANALYTICS=1 HOMEBREW_NO_AUTO_UPDATE=1 brew tap homebrew/core \
&& chown -R linuxbrew: /home/linuxbrew/.linuxbrew \ && chown -R linuxbrew: /home/linuxbrew/.linuxbrew \
&& chmod -R g+w,o-w /home/linuxbrew/.linuxbrew \ && chmod -R g+w,o-w /home/linuxbrew/.linuxbrew \
&& rm -rf ~/.cache \ && rm -rf ~/.cache \
&& brew install-bundler-gems \ && brew install-bundler-gems \
&& brew cleanup && brew cleanup