commit 9f6e45364879515ce0e041098cd6da4efc802b88
author Ash Wilson <ash.d.wilson@gmail.com> Sat Feb 20 10:21:34 2016 -0800
committer Ash Wilson <ash.d.wilson@gmail.com> Sat Feb 20 10:21:34 2016 -0800
tree 1ba56933062033a9ccea00ff18fe50455a002fb4
parent 686964d80198c3cb172552958b9963143f1ea9d6

Ubuntu14 and 15 tests

Ubuntu14.docker

diff --git a/Ubuntu14.docker b/Ubuntu14.docker
index a7a7648..44d7ca5 100644
--- a/Ubuntu14.docker
+++ b/Ubuntu14.docker
@@ -1,8 +1,6 @@
 FROM ubuntu:14.04
 
-ENV GRGSM_GIT=https://github.com/ptrkrysik/gr-gsm
 ENV OSMOCORE_GIT=git://git.osmocom.org/libosmocore.git
-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 || \
@@ -38,19 +36,19 @@
 
 
 RUN /usr/bin/git clone $OSMOCORE_GIT && \
-  cd libosmocore && \
-  autoreconf -i && \
-  ./configure && \
-  make && \
-  make install && \
-  ldconfig -i
+    cd libosmocore && \
+    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

Ubuntu15.docker

diff --git a/Ubuntu15.docker b/Ubuntu15.docker
new file mode 100644
index 0000000..6cb03d4
--- /dev/null
+++ b/Ubuntu15.docker
@@ -0,0 +1,73 @@
+FROM ubuntu:15.04
+MAINTAINER Ash Wilson
+
+ENV OSMOSDR_GIT="git://git.osmocom.org/libosmocore.git"
+
+# 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 \
+    python \
+    python-scipy \
+    cmake \
+    make \
+    autoconf \
+    automake \
+    cpp-4.9 \
+    gcc \
+    g++ \
+    libstdc++-4.9-dev \
+    libcppunit-dev \
+    swig \
+    swig2.0 \
+    doxygen \
+    liblog4cpp5 \
+    liblog4cpp5-dev \
+    build-essential \
+    libtool \
+    shtool \
+    pkg-config \
+    libpcsclite-dev \
+    gnuradio \
+    gnuradio-dev \
+    gr-osmosdr \
+    libfftw3-dev \
+    libusb-1.0-0-dev \
+    libvolk-dev \
+    libvolk0.0.0 \
+    libboost-all-dev \
+    libgnuradio-osmosdr0.1.3 \
+    libmirisdr0 \
+    libosmosdr-dev \
+    libosmosdr0 \
+    librtlsdr-dev \
+    librtlsdr0 \
+    osmo-sdr \
+    rtl-sdr \
+    wget \
+    python-talloc-dev \
+    libtalloc2 \
+    libtalloc-dev \
+    unzip 
+
+# Build libosmosdr
+RUN git clone $OSMOSDR_GIT && \
+    cd libosmocore && \
+    autoreconf -i && \
+    ./configure && \
+    make && \
+    make install && \
+    ldconfig -i 
+
+COPY ./ /src/
+RUN mkdir /src/build && \
+    cd /src/build && \
+    cmake .. && \
+    make && \
+    make test && \
+    make install && \
+    ldconfig
+