Fix double slash prefix & use correct ldconfig

This commit is contained in:
Joe Groocock 2017-08-15 22:15:03 +01:00
parent e12c5a3cfb
commit feb1b2c5d0
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86

View File

@ -39,8 +39,8 @@ RUN curl -fL https://ftp.gnu.org/gnu/glibc/glibc-${GLIBC_VER}.tar.xz \
\ \
exec >/dev/null && \ exec >/dev/null && \
../configure \ ../configure \
--prefix=/ \ --prefix= \
--libdir="/lib" \ --libdir=/lib \
--libexecdir=/lib \ --libexecdir=/lib \
--enable-add-ons \ --enable-add-ons \
--enable-obsolete-rpc \ --enable-obsolete-rpc \
@ -67,9 +67,7 @@ RUN apt-get install -y file && \
cp -d out/bin/ldd "${PREFIX}/bin" && \ cp -d out/bin/ldd "${PREFIX}/bin" && \
cp -d out/sbin/ldconfig "${PREFIX}/sbin" && \ cp -d out/sbin/ldconfig "${PREFIX}/sbin" && \
\ \
echo /usr/lib > "${PREFIX}/etc/ld.so.conf" && \ echo /usr/lib > "${PREFIX}/etc/ld.so.conf"
ldconfig -r "${PREFIX}" && \
ldconfig -r "${PREFIX}" -p
WORKDIR /tmp/busybox WORKDIR /tmp/busybox
@ -101,5 +99,7 @@ WORKDIR /
COPY --from=builder /output/ / COPY --from=builder /output/ /
RUN mkdir -p /tmp && \ RUN mkdir -p /tmp && \
chmod 1777 /tmp chmod 1777 /tmp
RUN ldconfig && \
ldconfig -p
CMD ["/bin/sh"] CMD ["/bin/sh"]