Hacky hacky hack
diff --git a/.travis.yml b/.travis.yml
index 2b58f4a..a2568c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,17 +4,15 @@
services:
- docker
-env: SAMPLE_FILE=https://github.com/ptrkrysik/test_data/raw/86df03f54d86093e2fe22daae8bb8c170cf31e58/vf_call6_a725_d174_g5_Kc1EF00BAB3BAC7002.cfile
matrix:
include:
- os: linux
language: generic
- env: DOCKERFILE=Ubuntu.docker
- env: IMGNAME=ubu-grgsm
+ env: DOCKERFILE=Ubuntu14.docker IMGNAME=ubu-grgsm SRC_IMGNAME=ubuntu:14.04
before_install:
- - cat $DOCKERFILE | docker build -t $IMGNAME -
-
+ - cat $DOCKERFILE | sed -e 's/SOURCE_IMAGE_NAME/$SRC_IMGNAME/g' > Dockerfile
+ - docker build -t $IMGNAME
script:
- - docker run -it --rm $IMGNAME --env CAPFILE=$SAMPLE_FILE /bin/bash /build_test.sh
+ - docker run -it --rm $IMGNAME --env CAPFILE=$SAMPLE_FILE /bin/bash /build_test_scripts/decode.sh
diff --git a/Ubuntu.dockerfile b/Ubuntu14.docker
similarity index 78%
rename from Ubuntu.dockerfile
rename to Ubuntu14.docker
index 666d64f..836e4c5 100644
--- a/Ubuntu.dockerfile
+++ b/Ubuntu14.docker
@@ -32,7 +32,8 @@
python-scipy \
librtlsdr-dev \
librtlsdr0 \
- rtl-sdr
+ rtl-sdr \
+ wget
RUN /usr/bin/git clone $OSMOCORE_GIT && \
@@ -52,13 +53,20 @@
# make install && \
# ldconfig
-RUN /usr/bin/git clone $GRGSM_GIT && \
- cd gr-gsm && \
- mkdir build && \
- cd build && \
- cmake .. && \
- make && \
- sudo make install &&\
- ldconfig
+#RUN /usr/bin/git clone $GRGSM_GIT && \
+# cd gr-gsm && \
+# mkdir build && \
+# cd build && \
+# cmake .. && \
+# make && \
+# sudo make install &&\
+# ldconfig
-COPY build_test.sh /
+COPY ./ /src/
+RUN ls /src
+RUN mkdir /src/build && \
+ cd /src/build && \
+ cmake .. && \
+ make && \
+ make install && \
+ ldconfig
diff --git a/build_test.sh b/build_test_scripts/decode.sh
similarity index 63%
rename from build_test.sh
rename to build_test_scripts/decode.sh
index 8370e1d..78c0293 100644
--- a/build_test.sh
+++ b/build_test_scripts/decode.sh
@@ -1,8 +1,6 @@
#!/bin/bash
export AP_DECODE=/usr/local/bin/airprobe_decode.py
+export CAPFILE=/test_data/vf_call6_a725_d174_g5_Kc1EF00BAB3BAC7002.cfile
# We expect $CAPFILE to be defined. If not, exit...
-if test -z $CAPFILE ; then
- echo "Missing CAPFILE environment variable."
- exit 1
-fi
+
/usr/bin/python $AP_DECODE -c $CAPFILE