Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-03 13:44:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.debian
View File

@ -3,7 +3,9 @@ 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 \
apt-get update --yes && \
apt-get install --no-install-recommends --yes \
automake \ automake \
autogen \ autogen \
bash \ bash \
@ -32,7 +34,8 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
vim \ vim \
wget \ wget \
xz-utils \ xz-utils \
zlib1g-dev && \ zlib1g-dev \
&& \
apt-get clean --yes apt-get clean --yes
ENV GOSU_VERSION 1.10 ENV GOSU_VERSION 1.10

6
common.docker
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,7 +27,8 @@ 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/build-and-install-git.sh \
/dockcross/utils.sh \ /dockcross/utils.sh \
/dockcross/build-and-install-openssl.sh \ /dockcross/build-and-install-openssl.sh \
/dockcross/build-and-install-openssh.sh \ /dockcross/build-and-install-openssh.sh \

11
common.manylinux
View File

@ -1,8 +1,11 @@
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 \
gpg \
zlib-devel \
gettext \
&& dpkgArch=$(if test $(uname -m) = "x86_64"; then echo amd64; else echo i386; fi) \ && 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 /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" \ && curl -o /tmp/gosu.asc -LO "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \