diff --git a/packaging/docker/Dockerfile.dev b/packaging/docker/Dockerfile.dev index 8f89bbdb6..d2dc91f2a 100644 --- a/packaging/docker/Dockerfile.dev +++ b/packaging/docker/Dockerfile.dev @@ -96,7 +96,7 @@ RUN cd /tmp && \ rm -rf /tmp/Criterion # Build & Install EtherLab -RUN cmd /tmp && \ +RUN cd /tmp && \ hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \ cd etherlab && \ ./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \ diff --git a/packaging/docker/Dockerfile.dev-centos b/packaging/docker/Dockerfile.dev-centos index ce0de3b92..1a54830da 100644 --- a/packaging/docker/Dockerfile.dev-centos +++ b/packaging/docker/Dockerfile.dev-centos @@ -51,7 +51,7 @@ RUN yum -y install \ pkgconfig make cmake3 \ autoconf automake autogen libtool \ flex bison \ - texinfo git curl tar \ + texinfo git mercurial curl tar \ protobuf-compiler protobuf-c-compiler # Several tools only needed for developement and testing @@ -89,7 +89,7 @@ RUN yum -y install \ libibverbs-devel \ librdmacm-devel \ re-devel \ - uldaq-devel + libusb1-devel # Build & Install fmtlib RUN cd /tmp && \ @@ -138,7 +138,7 @@ RUN cd /tmp && \ rm -rf /tmp/uldaq # Build & Install EtherLab -RUN cmd /tmp && \ +RUN cd /tmp && \ hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \ cd etherlab && \ ./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \ diff --git a/packaging/docker/Dockerfile.dev-debian-multiarch b/packaging/docker/Dockerfile.dev-debian-multiarch index 2610d5254..a678b52c5 100644 --- a/packaging/docker/Dockerfile.dev-debian-multiarch +++ b/packaging/docker/Dockerfile.dev-debian-multiarch @@ -48,7 +48,7 @@ RUN dpkg --add-architecture ${ARCH} RUN apt-get update && apt-get install -y \ crossbuild-essential-${ARCH} \ pkg-config make ninja-build \ - texinfo git curl tar wget\ + texinfo git mercurial curl tar wget\ protobuf-compiler protobuf-c-compiler # Dependencies @@ -126,7 +126,7 @@ RUN cd /tmp && \ rm -rf /tmp/uldaq # Build & Install EtherLab -RUN cmd /tmp && \ +RUN cd /tmp && \ hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \ cd etherlab && \ ./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \ diff --git a/packaging/docker/Dockerfile.dev-raspbian b/packaging/docker/Dockerfile.dev-raspbian index 979e1422f..b5f5c231f 100644 --- a/packaging/docker/Dockerfile.dev-raspbian +++ b/packaging/docker/Dockerfile.dev-raspbian @@ -32,7 +32,7 @@ RUN apt-get update && \ apt-get install -y \ autoconf automake libtool cmake \ pkg-config make gcc g++\ - git curl wget tar bzip2 \ + git mercurial curl wget tar bzip2 \ protobuf-compiler protobuf-c-compiler # Dependencies @@ -100,7 +100,7 @@ RUN cd /tmp && \ rm -rf /tmp/uldaq # Build & Install EtherLab -RUN cmd /tmp && \ +RUN cd /tmp && \ hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \ cd etherlab && \ ./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \ diff --git a/packaging/docker/Dockerfile.dev-ubuntu b/packaging/docker/Dockerfile.dev-ubuntu index ba86d6213..eda6c19e5 100644 --- a/packaging/docker/Dockerfile.dev-ubuntu +++ b/packaging/docker/Dockerfile.dev-ubuntu @@ -40,9 +40,9 @@ ENV DEBIAN_FRONTEND=noninteractive # Toolchain RUN apt-get update && apt-get install -y \ - gcc g++ \ - pkg-config cmake make ninja-build \ - texinfo git curl tar \ + autoconf automake libtool cmake \ + pkg-config make gcc g++ ninja-build \ + texinfo git mercurial curl tar \ protobuf-compiler protobuf-c-compiler # Several tools only needed for developement and testing @@ -78,7 +78,8 @@ RUN apt-get update && apt-get install -y \ libcomedi-dev \ libibverbs-dev \ librdmacm-dev \ - libre-dev + libre-dev \ + libusb-1.0-0-dev # Build & Install fmtlib RUN cd /tmp && \ @@ -127,7 +128,7 @@ RUN cd /tmp && \ rm -rf /tmp/uldaq # Build & Install EtherLab -RUN cmd /tmp && \ +RUN cd /tmp && \ hg clone --branch stable-1.5 http://hg.code.sf.net/p/etherlabmaster/code etherlab && \ cd etherlab && \ ./bootstrap && ./configure --enable-userlib=yes --enable-kernel=no --enable-tool=no && \