STYLE: Tweak indent in common.debian and common.docker

This commit is contained in:
Jean-Christophe Fillion-Robin 2018-06-04 23:53:38 -04:00
parent 007899c2a5
commit bd811da018
No known key found for this signature in database
GPG Key ID: BAF1E1AEB9097A41
3 changed files with 60 additions and 52 deletions

View File

@ -3,36 +3,39 @@ RUN REPO=http://cdn-fastly.deb.debian.org && \
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update --yes && apt-get install --no-install-recommends --yes \ RUN \
automake \ apt-get update --yes && \
autogen \ apt-get install --no-install-recommends --yes \
bash \ automake \
build-essential \ autogen \
bc \ bash \
bzip2 \ build-essential \
ca-certificates \ bc \
curl \ bzip2 \
file \ ca-certificates \
gettext \ curl \
gzip \ file \
zip \ gettext \
make \ gzip \
ncurses-dev \ zip \
pkg-config \ make \
libtool \ ncurses-dev \
python \ pkg-config \
python-pip \ libtool \
rsync \ python \
sed \ python-pip \
ssh \ rsync \
bison \ sed \
flex \ ssh \
tar \ bison \
pax \ flex \
vim \ tar \
wget \ pax \
xz-utils \ vim \
zlib1g-dev && \ wget \
xz-utils \
zlib1g-dev \
&& \
apt-get clean --yes apt-get clean --yes
ENV GOSU_VERSION 1.10 ENV GOSU_VERSION 1.10

View File

@ -3,7 +3,8 @@ WORKDIR /usr/src
ARG GIT_VERSION=2.16.2 ARG GIT_VERSION=2.16.2
ARG CMAKE_VERSION=3.11.0 ARG CMAKE_VERSION=3.11.0
COPY imagefiles/build-and-install-git.sh \ COPY \
imagefiles/build-and-install-git.sh \
imagefiles/utils.sh \ imagefiles/utils.sh \
imagefiles/build-and-install-openssl.sh \ imagefiles/build-and-install-openssl.sh \
imagefiles/build-and-install-openssh.sh \ imagefiles/build-and-install-openssh.sh \
@ -26,13 +27,14 @@ RUN \
/dockcross/build-and-install-git.sh && \ /dockcross/build-and-install-git.sh && \
/dockcross/install-cmake-binary.sh || exit 1; \ /dockcross/install-cmake-binary.sh || exit 1; \
fi; \ fi; \
rm /dockcross/build-and-install-git.sh \ rm \
/dockcross/utils.sh \ /dockcross/build-and-install-git.sh \
/dockcross/build-and-install-openssl.sh \ /dockcross/utils.sh \
/dockcross/build-and-install-openssh.sh \ /dockcross/build-and-install-openssl.sh \
/dockcross/build-and-install-cmake.sh \ /dockcross/build-and-install-openssh.sh \
/dockcross/install-cmake-binary.sh \ /dockcross/build-and-install-cmake.sh \
/dockcross/build-and-install-curl.sh /dockcross/install-cmake-binary.sh \
/dockcross/build-and-install-curl.sh
COPY imagefiles/cmake.sh /usr/local/bin/cmake COPY imagefiles/cmake.sh /usr/local/bin/cmake
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake COPY imagefiles/ccmake.sh /usr/local/bin/ccmake

View File

@ -1,18 +1,21 @@
ENV GOSU_VERSION 1.10 ENV GOSU_VERSION 1.10
RUN set -x \ RUN \
&& yum -y install epel-release \ set -x \
&& yum -y install gpg \ && yum -y install \
&& yum -y install zlib-devel gettext \ epel-release \
&& dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi) \ gpg \
&& curl -o /usr/bin/gosu -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ zlib-devel \
&& curl -o /tmp/gosu.asc -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ gettext \
&& export GNUPGHOME="$(mktemp -d)" \ && dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi) \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && curl -o /usr/bin/gosu -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \
&& gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \ && curl -o /tmp/gosu.asc -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \
&& rm -r "$GNUPGHOME" /tmp/gosu.asc \ && export GNUPGHOME="$(mktemp -d)" \
&& chmod +x /usr/bin/gosu \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gosu nobody true \ && gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \
&& yum clean all && rm -r "$GNUPGHOME" /tmp/gosu.asc \
&& chmod +x /usr/bin/gosu \
&& gosu nobody true \
&& yum clean all
RUN rm /opt/rh/devtoolset-2/root/usr/bin/sudo RUN rm /opt/rh/devtoolset-2/root/usr/bin/sudo
COPY manylinux-common/install-python-packages.sh /usr/local/bin COPY manylinux-common/install-python-packages.sh /usr/local/bin