Removed calls to 'cd' bash command and replaced it with WORKDIR
which should work better according to docker's manual
diff --git a/tests/dockerfiles/Debian_testing.docker b/tests/dockerfiles/Debian_testing.docker
index 24dde82..4b3bced 100644
--- a/tests/dockerfiles/Debian_testing.docker
+++ b/tests/dockerfiles/Debian_testing.docker
@@ -1,7 +1,7 @@
FROM debian:testing
+MAINTAINER Ash Wilson
RUN apt-get update && apt-get install -y \
- uhd-host \
cmake \
autoconf \
libtool \
@@ -18,9 +18,9 @@
COPY ./ /src/
RUN ls /src
-RUN mkdir /src/build && \
- cd /src/build && \
- cmake .. && \
+RUN mkdir /src/build
+WORKDIR /src/build
+RUN cmake .. && \
make && \
make install && \
ldconfig
diff --git a/tests/dockerfiles/Ubuntu_15_04.docker b/tests/dockerfiles/Ubuntu_15_04.docker
index 74304bd..58ef22c 100644
--- a/tests/dockerfiles/Ubuntu_15_04.docker
+++ b/tests/dockerfiles/Ubuntu_15_04.docker
@@ -9,7 +9,7 @@
sed -i "s/Status: install ok half-configured/Status: install ok installed/g" /var/lib/dpkg/status
-RUN apt-get install -y \
+RUN apt-get update && apt-get install -y \
git \
python \
python-scipy \
@@ -55,9 +55,9 @@
unzip
# Build libosmosdr
- RUN git clone $OSMOSDR_GIT && \
- cd libosmocore && \
- git checkout tags/$OSMOCORE_TAG && \
+RUN git clone $OSMOSDR_GIT
+WORKDIR libosmocore
+RUN git checkout tags/$OSMOCORE_TAG && \
autoreconf -i && \
./configure && \
make && \
@@ -70,10 +70,10 @@
RUN echo "[grc]\nlocal_blocks_path=/usr/local/share/gnuradio/grc/blocks" > \
/root/.gnuradio/config.conf
-RUN mkdir /src/build && \
- cd /src/build && \
- cmake .. && \
+RUN mkdir /src/build
+WORKDIR /src/build
+RUN cmake .. && \
make && \
- # make test && \
+ make test && \
make install && \
ldconfig
diff --git a/tests/dockerfiles/Ubuntu_16_04.docker b/tests/dockerfiles/Ubuntu_16_04.docker
index de0b215..ac3e549 100644
--- a/tests/dockerfiles/Ubuntu_16_04.docker
+++ b/tests/dockerfiles/Ubuntu_16_04.docker
@@ -2,7 +2,6 @@
MAINTAINER Ash Wilson
RUN apt-get update && apt-get install -y \
- uhd-host \
cmake \
autoconf \
libtool \
@@ -19,9 +18,9 @@
COPY ./ /src/
RUN ls /src
-RUN mkdir /src/build && \
- cd /src/build && \
- cmake .. && \
+RUN mkdir /src/build
+WORKDIR /src/build
+RUN cmake .. && \
make && \
make install && \
ldconfig
diff --git a/tests/dockerfiles/Ubuntu_16_04_debbuild.docker b/tests/dockerfiles/Ubuntu_16_04_debbuild.docker
index ea34f67..030ece8 100644
--- a/tests/dockerfiles/Ubuntu_16_04_debbuild.docker
+++ b/tests/dockerfiles/Ubuntu_16_04_debbuild.docker
@@ -2,7 +2,6 @@
MAINTAINER Ash Wilson
RUN apt-get update && apt-get install -y \
- uhd-host \
cmake \
autoconf \
libtool \
@@ -19,9 +18,9 @@
COPY ./ /src/
RUN ls /src
-RUN mkdir /src/build && \
- cd /src/build && \
- cmake .. && \
+RUN mkdir /src/build
+WORKDIR /src/build
+RUN cmake .. && \
make package && \
cpack -G DEB && \
ls