spritsail/plex-test
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify 'make' usage

Browse Source
This commit is contained in:
Joe Groocock 2019-02-13 23:08:39 +00:00
parent e3e2175060
commit 7c17e4103b
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.yml
View File

@ -3,6 +3,7 @@ pipeline:
image: spritsail/docker-build image: spritsail/docker-build
volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
repo: plex-dev repo: plex-dev
make: true
test-bin: test-bin:
image: spritsail/docker-test image: spritsail/docker-test

16
Dockerfile
View File

@ -17,6 +17,8 @@ ARG XMLSTAR_VER
ARG LIBRE_VER=2.8.2 ARG LIBRE_VER=2.8.2
ARG CURL_VER ARG CURL_VER
ARG MAKEFLAGS=-j2
RUN apt-get -y update \ RUN apt-get -y update \
&& apt-get -y install zlib1g-dev && apt-get -y install zlib1g-dev
@ -34,8 +36,7 @@ RUN git clone https://gitlab.gnome.org/GNOME/libxml2.git --branch $LIBXML2_VER -
--without-legacy \ --without-legacy \
--without-modules \ --without-modules \
--without-python \ --without-python \
&& make -j$(nproc) \ && make DESTDIR=/prefix install
&& make -j$(nproc) DESTDIR=/prefix install
# Download and build libxslt # Download and build libxslt
WORKDIR /tmp/libxslt WORKDIR /tmp/libxslt
@ -46,8 +47,7 @@ RUN git clone https://gitlab.gnome.org/GNOME/libxslt.git --branch $LIBXSLT_VER -
--without-crypto \ --without-crypto \
--without-plugins \ --without-plugins \
--without-python \ --without-python \
&& make -j$(nproc) \ && make DESTDIR=/prefix install
&& make -j$(nproc) DESTDIR=/prefix install
# Download and build xmlstarlet # Download and build xmlstarlet
ADD xmlstarlet-*.patch /tmp ADD xmlstarlet-*.patch /tmp
@ -60,8 +60,7 @@ RUN git clone git://git.code.sf.net/p/xmlstar/code --branch $XMLSTAR_VER --depth
--disable-build-docs \ --disable-build-docs \
--with-libxml-prefix=/prefix/usr \ --with-libxml-prefix=/prefix/usr \
--with-libxslt-prefix=/prefix/usr \ --with-libxslt-prefix=/prefix/usr \
&& make -j$(nproc) \ && make DESTDIR=/prefix install
&& make -j$(nproc) DESTDIR=/prefix install
# Download and build LibreSSL as a cURL dependency # Download and build LibreSSL as a cURL dependency
WORKDIR /tmp/libressl WORKDIR /tmp/libressl
@ -69,7 +68,7 @@ RUN curl -sSL https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRE_VER}
| tar xz --strip-components=1 \ | tar xz --strip-components=1 \
# Install to the default system directories so cURL can find it # Install to the default system directories so cURL can find it
&& ./configure --prefix=/usr \ && ./configure --prefix=/usr \
&& make -j$(nproc) install && make install
# Download and build curl # Download and build curl
WORKDIR /tmp/curl WORKDIR /tmp/curl
@ -109,8 +108,7 @@ RUN git clone https://github.com/curl/curl.git --branch $CURL_VER --depth 1 . \
--without-libpsl \ --without-libpsl \
--without-librtmp \ --without-librtmp \
--without-winidn \ --without-winidn \
&& make -j$(nproc) \ && make DESTDIR=/prefix install
&& make -j$(nproc) DESTDIR=/prefix install
WORKDIR /prefix WORKDIR /prefix