mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 16:24:27 +01:00
STYLE: Tweak indent in common.debian and common.docker
This commit is contained in:
parent
007899c2a5
commit
bd811da018
@ -3,7 +3,9 @@ RUN REPO=http://cdn-fastly.deb.debian.org && \
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
|
||||
RUN \
|
||||
apt-get update --yes && \
|
||||
apt-get install --no-install-recommends --yes \
|
||||
automake \
|
||||
autogen \
|
||||
bash \
|
||||
@ -32,7 +34,8 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
|
||||
vim \
|
||||
wget \
|
||||
xz-utils \
|
||||
zlib1g-dev && \
|
||||
zlib1g-dev \
|
||||
&& \
|
||||
apt-get clean --yes
|
||||
|
||||
ENV GOSU_VERSION 1.10
|
||||
|
@ -3,7 +3,8 @@ WORKDIR /usr/src
|
||||
ARG GIT_VERSION=2.16.2
|
||||
ARG CMAKE_VERSION=3.11.0
|
||||
|
||||
COPY imagefiles/build-and-install-git.sh \
|
||||
COPY \
|
||||
imagefiles/build-and-install-git.sh \
|
||||
imagefiles/utils.sh \
|
||||
imagefiles/build-and-install-openssl.sh \
|
||||
imagefiles/build-and-install-openssh.sh \
|
||||
@ -26,7 +27,8 @@ RUN \
|
||||
/dockcross/build-and-install-git.sh && \
|
||||
/dockcross/install-cmake-binary.sh || exit 1; \
|
||||
fi; \
|
||||
rm /dockcross/build-and-install-git.sh \
|
||||
rm \
|
||||
/dockcross/build-and-install-git.sh \
|
||||
/dockcross/utils.sh \
|
||||
/dockcross/build-and-install-openssl.sh \
|
||||
/dockcross/build-and-install-openssh.sh \
|
||||
|
@ -1,8 +1,11 @@
|
||||
ENV GOSU_VERSION 1.10
|
||||
RUN set -x \
|
||||
&& yum -y install epel-release \
|
||||
&& yum -y install gpg \
|
||||
&& yum -y install zlib-devel gettext \
|
||||
RUN \
|
||||
set -x \
|
||||
&& yum -y install \
|
||||
epel-release \
|
||||
gpg \
|
||||
zlib-devel \
|
||||
gettext \
|
||||
&& dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi) \
|
||||
&& curl -o /usr/bin/gosu -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
|
||||
&& curl -o /tmp/gosu.asc -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \
|
||||
|
Loading…
Reference in New Issue
Block a user