Remove duplicated build steps - new builder image

This commit is contained in:
Adam Dodman 2017-08-10 13:38:31 +01:00
parent 591ad2f204
commit dca2ce17bd

View File

@ -2,7 +2,6 @@ FROM frebib/debian-builder as builder
ARG ARCH=x86_64 ARG ARCH=x86_64
ARG ARCH_ALT=i686 ARG ARCH_ALT=i686
ARG DEBIAN_FRONTEND=noninteractive
ARG GLIBC_VER=2.26 ARG GLIBC_VER=2.26
ARG BUSYB_VER=1.27.1 ARG BUSYB_VER=1.27.1
@ -13,9 +12,7 @@ ARG PREFIX=/output
WORKDIR $PREFIX WORKDIR $PREFIX
#Set up our dependencies, configure the output filesystem a bit #Set up our dependencies, configure the output filesystem a bit
RUN apt-get update -qy && \ RUN mkdir -p bin dev etc home lib proc root sbin tmp usr/bin usr/sbin usr/lib var && \
apt-get install -qy curl build-essential gawk linux-libc-dev && \
mkdir -p bin dev etc home lib proc root sbin tmp usr/bin usr/sbin usr/lib var && \
# This is probably only relevant on 64bit systems? # This is probably only relevant on 64bit systems?
ln -sv usr/lib usr/lib64 && \ ln -sv usr/lib usr/lib64 && \
ln -sv lib lib64 ln -sv lib lib64
@ -27,9 +24,6 @@ RUN curl -fL https://github.com/javabean/su-exec/releases/download/${SU_EXEC_VER
WORKDIR /tmp/glibc WORKDIR /tmp/glibc
ARG CFLAGS="-Os -pipe -fstack-protector-strong"
ARG LDFLAGS="-Wl,-O1,--sort-common -Wl,-s"
# Download and build glibc from source # Download and build glibc from source
RUN curl -fL https://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VER}.tar.xz | tar xJ && \ RUN curl -fL https://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VER}.tar.xz | tar xJ && \
mkdir -p glibc-build && cd glibc-build && \ mkdir -p glibc-build && cd glibc-build && \