use docker layer to cache build process
This commit is contained in:
parent
9603287ea6
commit
971580b2aa
2 changed files with 32 additions and 37 deletions
|
@ -17,10 +17,40 @@ FROM BASEIMAGE
|
|||
|
||||
CROSS_BUILD_COPY qemu-ARCH-static /usr/bin/
|
||||
|
||||
COPY build.sh /
|
||||
|
||||
RUN clean-install bash
|
||||
|
||||
RUN mkdir -p /etc/nginx
|
||||
|
||||
# install required packages to build
|
||||
RUN apt-get update && apt-get dist-upgrade -y && \
|
||||
clean-install \
|
||||
bash \
|
||||
build-essential \
|
||||
curl ca-certificates \
|
||||
libgeoip1 \
|
||||
libgeoip-dev \
|
||||
patch \
|
||||
libpcre3 \
|
||||
libpcre3-dev \
|
||||
libssl-dev \
|
||||
zlib1g \
|
||||
zlib1g-dev \
|
||||
libaio1 \
|
||||
libaio-dev \
|
||||
openssl \
|
||||
libperl-dev \
|
||||
cmake \
|
||||
util-linux \
|
||||
lmdb-utils \
|
||||
libjemalloc1 libjemalloc-dev \
|
||||
wget \
|
||||
libcurl4-openssl-dev \
|
||||
procps \
|
||||
git g++ pkgconf flex bison doxygen libyajl-dev liblmdb-dev libtool dh-autoreconf libxml2 libpcre++-dev libxml2-dev \
|
||||
lua-cjson \
|
||||
|| exit 1
|
||||
|
||||
COPY build.sh /
|
||||
RUN /build.sh
|
||||
|
||||
# Create symlinks to redirect nginx logs to stdout and stderr docker log collector
|
||||
|
|
|
@ -56,41 +56,6 @@ if [[ ${ARCH} == "ppc64le" ]]; then
|
|||
clean-install software-properties-common
|
||||
fi
|
||||
|
||||
apt-get update && apt-get dist-upgrade -y
|
||||
|
||||
# install required packages to build
|
||||
clean-install \
|
||||
bash \
|
||||
build-essential \
|
||||
curl ca-certificates \
|
||||
libgeoip1 \
|
||||
libgeoip-dev \
|
||||
patch \
|
||||
libpcre3 \
|
||||
libpcre3-dev \
|
||||
libssl-dev \
|
||||
zlib1g \
|
||||
zlib1g-dev \
|
||||
libaio1 \
|
||||
libaio-dev \
|
||||
openssl \
|
||||
libperl-dev \
|
||||
cmake \
|
||||
util-linux \
|
||||
lua5.1 liblua5.1-0 liblua5.1-dev \
|
||||
lmdb-utils \
|
||||
libjemalloc1 libjemalloc-dev \
|
||||
wget \
|
||||
libcurl4-openssl-dev \
|
||||
procps \
|
||||
git g++ pkgconf flex bison doxygen libyajl-dev liblmdb-dev libtool dh-autoreconf libxml2 libpcre++-dev libxml2-dev \
|
||||
lua-cjson \
|
||||
|| exit 1
|
||||
|
||||
ln -s /usr/lib/x86_64-linux-gnu/liblua5.1.so /usr/lib/liblua.so
|
||||
|
||||
mkdir -p /etc/nginx
|
||||
|
||||
if [[ ${ARCH} == "s390x" ]]; then
|
||||
# avoid error:
|
||||
# git: ../nptl/pthread_mutex_lock.c:81: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed.
|
||||
|
|
Loading…
Reference in a new issue