aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-04-21 15:30:30 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2021-04-16 13:38:24 +0000
commitecde2726437b4934e740f556f03e67ce15d8e677 (patch)
tree63599127a080daa253e4dc066ac57f93b116c89e
parentc79b9cc388b4ed2b0fc8366fb8a596ae1fbf43dc (diff)
add meas_web
-rw-r--r--meas_web/Dockerfile18
-rw-r--r--meas_web/Makefile3
-rw-r--r--osmo-nitb-master/Dockerfile20
3 files changed, 39 insertions, 2 deletions
diff --git a/meas_web/Dockerfile b/meas_web/Dockerfile
new file mode 100644
index 0000000..557ed02
--- /dev/null
+++ b/meas_web/Dockerfile
@@ -0,0 +1,18 @@
+FROM neels/osmo-nitb-master
+
+MAINTAINER Neels Hofmeyr <neels@hofmeyr.de>
+
+RUN apt-get install -y unzip
+RUN wget --no-check-certificate -O /tmp/websocketd.zip https://github.com/joewalnes/websocketd/releases/download/v0.3.0/websocketd-0.3.0-linux_amd64.zip
+RUN mkdir /websocketd \
+ && cd /websocketd \
+ && unzip /tmp/websocketd.zip
+
+RUN cd / \
+ && git clone git://github.com/whyteks/meas_web
+
+RUN apt-get install -y tcpdump
+RUN apt-get install -y netcat6
+
+WORKDIR /
+CMD /websocketd/websocketd --staticdir=/meas_web/usr/share/fairwaves-meas-web --port=80 /usr/bin/stdbuf -oL meas_json
diff --git a/meas_web/Makefile b/meas_web/Makefile
new file mode 100644
index 0000000..79a894e
--- /dev/null
+++ b/meas_web/Makefile
@@ -0,0 +1,3 @@
+RUN_ARGS?=--rm
+
+include ../make/Makefile
diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile
index 43a8d22..4061e12 100644
--- a/osmo-nitb-master/Dockerfile
+++ b/osmo-nitb-master/Dockerfile
@@ -4,6 +4,21 @@ FROM $USER/$DISTRO-build
# Arguments used after FROM must be specified again
ARG DISTRO
+MAINTAINER Harald Welte <laforge@gnumonks.org>
+
+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/Debian_9.0/"
+
+COPY Release.key /tmp/Release.key
+
+RUN apt-key add /tmp/Release.key && \
+ rm /tmp/Release.key && \
+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list
+
+# we need to add this to invalidate the cache once the repository is updated.
+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM
+# (dependency libcdk5 is for meas_vis, used by the meas_feed docker image)
+ADD $OSMOCOM_REPO/Release /tmp/Release
+ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/nightly/CentOS_8/repodata/repomd.xml /tmp/repomd.xml
RUN apt-get update && \
apt-get install -y --no-install-recommends \
libosmocore-dev \
@@ -11,8 +26,9 @@ RUN apt-get update && \
libosmo-netif-dev \
libosmo-sccp-dev \
libsmpp34-dev \
- libgtp-dev && \
- apt-get clean
+ libgtp-dev \
+ libcdk5-dev \
+ && apt-get clean
WORKDIR /tmp