Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24: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

63
common.debian
View File

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

18
common.docker
View File

@ -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,13 +27,14 @@ RUN \
/dockcross/build-and-install-git.sh && \
/dockcross/install-cmake-binary.sh || exit 1; \
fi; \
rm /dockcross/build-and-install-git.sh \
/dockcross/utils.sh \
/dockcross/build-and-install-openssl.sh \
/dockcross/build-and-install-openssh.sh \
/dockcross/build-and-install-cmake.sh \
/dockcross/install-cmake-binary.sh \
/dockcross/build-and-install-curl.sh
rm \
/dockcross/build-and-install-git.sh \
/dockcross/utils.sh \
/dockcross/build-and-install-openssl.sh \
/dockcross/build-and-install-openssh.sh \
/dockcross/build-and-install-cmake.sh \
/dockcross/install-cmake-binary.sh \
/dockcross/build-and-install-curl.sh
COPY imagefiles/cmake.sh /usr/local/bin/cmake
COPY imagefiles/ccmake.sh /usr/local/bin/ccmake

31
common.manylinux
View File

@ -1,18 +1,21 @@
ENV GOSU_VERSION 1.10
RUN set -x \
&& yum -y install epel-release \
&& yum -y install gpg \
&& yum -y install 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" \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \
&& rm -r "$GNUPGHOME" /tmp/gosu.asc \
&& chmod +x /usr/bin/gosu \
&& gosu nobody true \
&& yum clean all
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" \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /tmp/gosu.asc /usr/bin/gosu \
&& 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
COPY manylinux-common/install-python-packages.sh /usr/local/bin