diff --git a/binutils/Dockerfile b/binutils/Dockerfile index 06f810c..87f2121 100644 --- a/binutils/Dockerfile +++ b/binutils/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross +FROM andrewd/musl-cross MAINTAINER Andrew Dunham # Add our build script diff --git a/ht/Dockerfile b/ht/Dockerfile index 4605cc3..811ea42 100644 --- a/ht/Dockerfile +++ b/ht/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross +FROM andrewd/musl-cross MAINTAINER Andrew Dunham # Install build tools diff --git a/musl-cross-arm/Dockerfile b/musl-cross-arm/Dockerfile deleted file mode 100644 index d9be8eb..0000000 --- a/musl-cross-arm/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:jessie -MAINTAINER Andrew Dunham - -# Install build tools -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade -yy && \ - DEBIAN_FRONTEND=noninteractive apt-get install -yy \ - automake \ - build-essential \ - curl \ - file \ - git \ - pkg-config \ - wget - -# Install musl-cross -RUN mkdir /build && \ - cd /build && \ - git clone https://github.com/GregorR/musl-cross.git && \ - cd musl-cross && \ - echo 'ARCH=arm' >> config.sh && \ - echo 'TRIPLE=arm-linux-musleabihf' >> config.sh && \ - echo 'GCC_BOOTSTRAP_CONFFLAGS="--with-arch=armv6 --with-float=hard --with-fpu=vfp"' >> config.sh && \ - echo 'GCC_CONFFLAGS="--with-arch=armv6 --with-float=hard --with-fpu=vfp"' >> config.sh && \ - echo 'GCC_BUILTIN_PREREQS=yes' >> config.sh && \ - sed -i -e 's/^MUSL_VERSION=.*$/MUSL_VERSION=1.1.10/' defs.sh && \ - ./build.sh - -CMD /bin/bash diff --git a/musl-cross/Dockerfile b/musl-cross/Dockerfile deleted file mode 100644 index 702247e..0000000 --- a/musl-cross/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM debian:jessie -MAINTAINER Andrew Dunham - -# Install build tools -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get upgrade -yy && \ - DEBIAN_FRONTEND=noninteractive apt-get install -yy \ - automake \ - build-essential \ - curl \ - git \ - pkg-config \ - wget - -# Install musl-cross -RUN mkdir /build && \ - cd /build && \ - git clone https://github.com/GregorR/musl-cross.git && \ - cd musl-cross && \ - echo 'GCC_BUILTIN_PREREQS=yes' >> config.sh && \ - sed -i -e 's/^MUSL_VERSION=.*$/MUSL_VERSION=1.1.10/' defs.sh && \ - ./build.sh - -CMD /bin/bash diff --git a/nmap/Dockerfile b/nmap/Dockerfile index 06f810c..87f2121 100644 --- a/nmap/Dockerfile +++ b/nmap/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross +FROM andrewd/musl-cross MAINTAINER Andrew Dunham # Add our build script diff --git a/p0f/Dockerfile b/p0f/Dockerfile index 06f810c..87f2121 100644 --- a/p0f/Dockerfile +++ b/p0f/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross +FROM andrewd/musl-cross MAINTAINER Andrew Dunham # Add our build script diff --git a/pv/arm/Dockerfile b/pv/arm/Dockerfile index 9889bc9..f4f9801 100644 --- a/pv/arm/Dockerfile +++ b/pv/arm/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross-arm +FROM andrewd/musl-cross-arm MAINTAINER Andrew Dunham # Add our build script diff --git a/python/Dockerfile b/python/Dockerfile index f56be04..e161d04 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross +FROM andrewd/musl-cross MAINTAINER Andrew Dunham # Add our build script diff --git a/yasm/Dockerfile b/yasm/Dockerfile index 06f810c..87f2121 100644 --- a/yasm/Dockerfile +++ b/yasm/Dockerfile @@ -1,4 +1,4 @@ -FROM andrewd/static-binaries-musl-cross +FROM andrewd/musl-cross MAINTAINER Andrew Dunham # Add our build script