diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dockerfiles/DebianJessie.docker | 52 | ||||
-rw-r--r-- | tests/dockerfiles/Debian_Jessie.docker | 33 | ||||
-rw-r--r-- | tests/dockerfiles/Debian_testing.docker | 26 | ||||
-rw-r--r-- | tests/dockerfiles/Ubuntu_16_04.docker | 48 |
4 files changed, 67 insertions, 92 deletions
diff --git a/tests/dockerfiles/DebianJessie.docker b/tests/dockerfiles/DebianJessie.docker deleted file mode 100644 index 538f105..0000000 --- a/tests/dockerfiles/DebianJessie.docker +++ /dev/null @@ -1,52 +0,0 @@ -FROM ashmastaflash/gradio37_debjessie - -ENV OSMOCORE_GIT=git://git.osmocom.org/libosmocore.git -ENV OSMOCORE_TAG=0.6.3 -ENV GR_OSMOSDR_GIT=git://git.osmocom.org/gr-osmosdr - -# We know it's going to foul up, so we run this install separately and then ...fix... dpkg status -#RUN apt-get update && apt-get install -y uhd-host || \ -# sed -i "s/Status: install ok half-configured/Status: install ok installed/g" /var/lib/dpkg/status - -RUN apt-get update && apt-get install -y \ - git \ - vim \ - cmake \ - autoconf \ - libtool \ - python-talloc-dev \ - libtalloc2 \ - libtalloc-dev \ - libpcsclite-dev \ - build-essential \ - libboost-all-dev \ - libcppunit-dev swig \ - doxygen \ - liblog4cpp5-dev \ - python-scipy \ - librtlsdr-dev \ - librtlsdr0 \ - rtl-sdr \ - wget \ - libxi-dev - - -RUN /usr/bin/git clone $OSMOCORE_GIT && \ - cd libosmocore && \ - git checkout tags/$OSMOCORE_TAG && \ - autoreconf -i && \ - ./configure && \ - make && \ - make install && \ - ldconfig -i - -COPY ./ /src/ -RUN ls /src - -RUN mkdir /src/build && \ - cd /src/build && \ - cmake .. && \ - make && \ - # make test && \ - make install && \ - ldconfig diff --git a/tests/dockerfiles/Debian_Jessie.docker b/tests/dockerfiles/Debian_Jessie.docker new file mode 100644 index 0000000..a359648 --- /dev/null +++ b/tests/dockerfiles/Debian_Jessie.docker @@ -0,0 +1,33 @@ +FROM debian:testing + +# We know it's going to foul up, so we run this install separately and then ...fix... dpkg status +RUN apt-get update && apt-get install -y uhd-host || \ + sed -i "s/Status: install ok half-configured/Status: install ok installed/g" /var/lib/dpkg/status + +RUN apt-get install -y \ + git \ + vim \ + cmake \ + autoconf \ + libtool \ + build-essential \ + libboost-all-dev \ + libcppunit-dev swig \ + doxygen \ + liblog4cpp5-dev \ + python-scipy \ + gnuradio \ + gnuradio-dev \ + gr-osmosdr \ + libosmogsm5 + +COPY ./ /src/ +RUN ls /src + +RUN mkdir /src/build && \ + cd /src/build && \ + cmake .. && \ + make && \ + make test && \ + make install && \ + ldconfig diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker new file mode 100644 index 0000000..24dde82 --- /dev/null +++ b/tests/dockerfiles/Debian_testing.docker @@ -0,0 +1,26 @@ +FROM debian:testing + +RUN apt-get update && apt-get install -y \ + uhd-host \ + cmake \ + autoconf \ + libtool \ + build-essential \ + libcppunit-dev \ + swig \ + doxygen \ + liblog4cpp5-dev \ + python-scipy \ + gnuradio-dev \ + gr-osmosdr \ + libosmocore-dev + +COPY ./ /src/ +RUN ls /src + +RUN mkdir /src/build && \ + cd /src/build && \ + cmake .. && \ + make && \ + make install && \ + ldconfig diff --git a/tests/dockerfiles/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker index 2340fed..6e7e280 100644 --- a/tests/dockerfiles/Ubuntu_16_04.docker +++ b/tests/dockerfiles/Ubuntu_16_04.docker @@ -1,54 +1,21 @@ FROM ubuntu:16.04 MAINTAINER Ash Wilson -# We know it's going to foul up, so we run this install separately and then ...fix... dpkg status -RUN apt-get update && apt-get install -y uhd-host || \ - sed -i "s/Status: install ok half-configured/Status: install ok installed/g" /var/lib/dpkg/status - -RUN apt-get install -y \ - git \ - python \ - python-scipy \ +RUN apt-get update && apt-get install -y \ + uhd-host \ cmake \ - make \ autoconf \ automake \ - cpp-4.9 \ - gcc \ - g++ \ - libstdc++-4.9-dev \ + build-essential \ libcppunit-dev \ swig \ doxygen \ - liblog4cpp5v5 \ liblog4cpp5-dev \ - build-essential \ libtool \ - shtool \ - pkg-config \ - libpcsclite-dev \ - gnuradio \ gnuradio-dev \ gr-osmosdr \ - libfftw3-dev \ - libusb-1.0-0-dev \ - libvolk1-dev \ - libvolk1.1 \ - libboost-all-dev \ - libgnuradio-osmosdr0.1.4 \ - libmirisdr0 \ - libosmosdr-dev \ - libosmosdr0 \ - librtlsdr-dev \ - librtlsdr0 \ - osmo-sdr \ - rtl-sdr \ - wget \ - python-talloc-dev \ - libtalloc2 \ - libtalloc-dev \ - unzip \ - libosmocore-dev + libosmocore-dev \ + python-scipy COPY ./ /src/ @@ -60,6 +27,7 @@ RUN mkdir /src/build && \ cd /src/build && \ cmake .. && \ make && \ - # make test && \ make install && \ - ldconfig + ldconfig && \ + + |