Pinning libosmocore version
This commit is contained in:
parent
0acdd758fc
commit
ca8f035d08
|
@ -1,6 +1,7 @@
|
||||||
FROM ubuntu:14.10
|
FROM ubuntu:14.10
|
||||||
|
|
||||||
ENV OSMOCORE_GIT=git://git.osmocom.org/libosmocore.git
|
ENV OSMOCORE_GIT=git://git.osmocom.org/libosmocore.git
|
||||||
|
ENV OSMOCORE_TAG=0.9.0
|
||||||
|
|
||||||
# Fix repos in docker image:
|
# Fix repos in docker image:
|
||||||
RUN sed -i "s/archive.ubuntu.com/old-releases.ubuntu.com/g" /etc/apt/sources.list
|
RUN sed -i "s/archive.ubuntu.com/old-releases.ubuntu.com/g" /etc/apt/sources.list
|
||||||
|
@ -38,13 +39,14 @@ RUN apt-get update && apt-get install -y \
|
||||||
libxi-dev
|
libxi-dev
|
||||||
|
|
||||||
|
|
||||||
#RUN /usr/bin/git clone $OSMOCORE_GIT && \
|
RUN /usr/bin/git clone $OSMOCORE_GIT && \
|
||||||
# cd libosmocore && \
|
cd libosmocore && \
|
||||||
# autoreconf -i && \
|
git checkout tags/$OSMOCORE_TAG && \
|
||||||
# ./configure && \
|
autoreconf -i && \
|
||||||
# make && \
|
./configure && \
|
||||||
# make install && \
|
make && \
|
||||||
# ldconfig -i
|
make install && \
|
||||||
|
ldconfig -i
|
||||||
|
|
||||||
|
|
||||||
COPY ./ /src/
|
COPY ./ /src/
|
||||||
|
|
|
@ -2,6 +2,7 @@ FROM ubuntu:15.04
|
||||||
MAINTAINER Ash Wilson
|
MAINTAINER Ash Wilson
|
||||||
|
|
||||||
ENV OSMOSDR_GIT="git://git.osmocom.org/libosmocore.git"
|
ENV OSMOSDR_GIT="git://git.osmocom.org/libosmocore.git"
|
||||||
|
ENV OSMOCORE_TAG=0.9.0
|
||||||
|
|
||||||
# We know it's going to foul up, so we run this install separately and then ...fix... dpkg status
|
# 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 || \
|
RUN apt-get update && apt-get install -y uhd-host || \
|
||||||
|
@ -54,13 +55,14 @@ RUN apt-get update && apt-get install -y \
|
||||||
unzip
|
unzip
|
||||||
|
|
||||||
# Build libosmosdr
|
# Build libosmosdr
|
||||||
# RUN git clone $OSMOSDR_GIT && \
|
RUN git clone $OSMOSDR_GIT && \
|
||||||
# cd libosmocore && \
|
cd libosmocore && \
|
||||||
# autoreconf -i && \
|
git checkout tags/$OSMOCORE_TAG && \
|
||||||
# ./configure && \
|
autoreconf -i && \
|
||||||
# make && \
|
./configure && \
|
||||||
# make install && \
|
make && \
|
||||||
# ldconfig -i
|
make install && \
|
||||||
|
ldconfig -i
|
||||||
|
|
||||||
COPY ./ /src/
|
COPY ./ /src/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue