diff options
| -rw-r--r-- | dockerfiles/DebianJessie.docker | 12 | ||||
| -rw-r--r-- | dockerfiles/Ubuntu14.docker | 2 | ||||
| -rw-r--r-- | dockerfiles/Ubuntu15.docker | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/dockerfiles/DebianJessie.docker b/dockerfiles/DebianJessie.docker index 74fdf30..43f54c8 100644 --- a/dockerfiles/DebianJessie.docker +++ b/dockerfiles/DebianJessie.docker @@ -1,6 +1,7 @@ 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 @@ -29,8 +30,19 @@ RUN apt-get update && apt-get install -y \ 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 .. && \ diff --git a/dockerfiles/Ubuntu14.docker b/dockerfiles/Ubuntu14.docker index 626d766..0622d09 100644 --- a/dockerfiles/Ubuntu14.docker +++ b/dockerfiles/Ubuntu14.docker @@ -1,7 +1,7 @@ FROM ubuntu:14.10 ENV OSMOCORE_GIT=git://git.osmocom.org/libosmocore.git -ENV OSMOCORE_TAG=0.9.0 +ENV OSMOCORE_TAG=0.6.3 # Fix repos in docker image: RUN sed -i "s/archive.ubuntu.com/old-releases.ubuntu.com/g" /etc/apt/sources.list diff --git a/dockerfiles/Ubuntu15.docker b/dockerfiles/Ubuntu15.docker index 4410e3e..d9070e8 100644 --- a/dockerfiles/Ubuntu15.docker +++ b/dockerfiles/Ubuntu15.docker @@ -2,7 +2,7 @@ FROM ubuntu:15.04 MAINTAINER Ash Wilson ENV OSMOSDR_GIT="git://git.osmocom.org/libosmocore.git" -ENV OSMOCORE_TAG=0.9.0 +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 || \ |