Removed old docker files and changed maintainer to Piotr Krysik
diff --git a/.travis.yml b/.travis.yml
index 6c1b51b..f6512fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,7 @@
language: ruby
env:
- #- DOCKERFILE=tests/dockerfiles/Debian_Jessie.docker IMGNAME=debjess-grgsm
- #- DOCKERFILE=tests/dockerfiles/Ubuntu_15_04.docker IMGNAME=ubu15.04-grgsm
- #- DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm
+ - DOCKERFILE=tests/dockerfiles/Debian_testing.docker IMGNAME=debtest-grgsm
- DOCKERFILE=tests/dockerfiles/Ubuntu_16_04.docker IMGNAME=ubu16.04-grgsm
services:
diff --git a/tests/dockerfiles/Debian_Jessie.docker b/tests/dockerfiles/Debian_Jessie.docker
deleted file mode 100644
index 1252314..0000000
--- a/tests/dockerfiles/Debian_Jessie.docker
+++ /dev/null
@@ -1,34 +0,0 @@
-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 \
- python-docutils \
- 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
index 26d67d6..c87e7dd 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -1,5 +1,5 @@
FROM debian:testing
-MAINTAINER Ash Wilson
+MAINTAINER Piotr Krysik
RUN apt-get update && apt-get install -y \
cmake \
diff --git a/tests/dockerfiles/Ubuntu_15_04.docker b/tests/dockerfiles/Ubuntu_15_04.docker
deleted file mode 100644
index 973b624..0000000
--- a/tests/dockerfiles/Ubuntu_15_04.docker
+++ /dev/null
@@ -1,80 +0,0 @@
-FROM ubuntu:15.04
-MAINTAINER Ash Wilson
-
-ENV OSMOSDR_GIT="git://git.osmocom.org/libosmocore.git"
-ENV OSMOCORE_TAG=0.6.3
-
-# 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 \
- python-docutils \
- 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
-WORKDIR libosmocore
-RUN git checkout tags/$OSMOCORE_TAG && \
- autoreconf -i && \
- ./configure && \
- make && \
- make install && \
- ldconfig -i
-
-COPY ./ /src/
-
-RUN mkdir /root/.gnuradio/
-RUN echo "[grc]\nlocal_blocks_path=/usr/local/share/gnuradio/grc/blocks" > \
- /root/.gnuradio/config.conf
-
-RUN mkdir /src/build
-WORKDIR /src/build
-RUN cmake .. && \
- make && \
- make test && \
- make install && \
- ldconfig
diff --git a/tests/dockerfiles/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker
index e0ccbea..695bfab 100644
--- a/tests/dockerfiles/Ubuntu_16_04.docker
+++ b/tests/dockerfiles/Ubuntu_16_04.docker
@@ -1,5 +1,5 @@
FROM ubuntu:16.04
-MAINTAINER Ash Wilson
+MAINTAINER Piotr Krysik
RUN apt-get update && apt-get install -y \
cmake \
diff --git a/tests/dockerfiles/Ubuntu_16_04_debbuild.docker b/tests/dockerfiles/Ubuntu_16_04_debbuild.docker
deleted file mode 100644
index 030ece8..0000000
--- a/tests/dockerfiles/Ubuntu_16_04_debbuild.docker
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Ash Wilson
-
-RUN apt-get update && apt-get install -y \
- 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
-WORKDIR /src/build
-RUN cmake .. && \
- make package && \
- cpack -G DEB && \
- ls
-
diff --git a/tests/dockerfiles/Ubuntu_16_04_debinstall.docker b/tests/dockerfiles/Ubuntu_16_04_debinstall.docker
deleted file mode 100644
index 0a476ce..0000000
--- a/tests/dockerfiles/Ubuntu_16_04_debinstall.docker
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM ubuntu:16.04
-MAINTAINER Ash Wilson
-
-RUN apt-get update && apt-get install -y \
- software-properties-common
-
-RUN add-apt-repository -y ppa:ptrkrysik/gr-gsm
-
-RUN apt-get update && apt-get install -y \
- gr-gsm
-
-COPY ./ /src/
-RUN ls /src