diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-21 15:30:30 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <nhofmeyr@sysmocom.de> | 2022-07-19 11:41:41 +0200 |
| commit | 92326423feb9edd8a49e0174f32215cb7d076ef8 (patch) | |
| tree | 6f2bcd72c9ceaf3134fbaf72f4f1e79c2b909e5d | |
| parent | b9551013746d7c9df82046fc2eb1b4df68684a8a (diff) | |
add meas_web
Change-Id: If01f8f0320ce300458779c8b5e5543a179fcd56f
| -rw-r--r-- | meas_web/Dockerfile | 18 | ||||
| -rw-r--r-- | meas_web/Makefile | 3 | ||||
| -rw-r--r-- | osmo-nitb-master/Dockerfile | 20 |
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 |