From aa1a6102036939106638e8a81ee2c8a01845be5d Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 10 Jul 2020 11:05:21 -0700 Subject: [PATCH] [docker] remove stale Dockerfiles (#5214) --- etc/docker/README.md | 37 -------------- etc/docker/arm32v7_ubuntu_wpantund/Dockerfile | 49 ------------------- etc/docker/ot_sim/Dockerfile | 19 ------- etc/docker/ot_sim/README.md | 47 ------------------ etc/docker/ot_sim/add_node | 2 - etc/docker/ot_sim/start_sim | 2 - etc/docker/ot_sim/stop_sim | 2 - etc/docker/x86_ubuntu_wpantund/Dockerfile | 49 ------------------- 8 files changed, 207 deletions(-) delete mode 100644 etc/docker/README.md delete mode 100644 etc/docker/arm32v7_ubuntu_wpantund/Dockerfile delete mode 100644 etc/docker/ot_sim/Dockerfile delete mode 100644 etc/docker/ot_sim/README.md delete mode 100755 etc/docker/ot_sim/add_node delete mode 100755 etc/docker/ot_sim/start_sim delete mode 100755 etc/docker/ot_sim/stop_sim delete mode 100644 etc/docker/x86_ubuntu_wpantund/Dockerfile diff --git a/etc/docker/README.md b/etc/docker/README.md deleted file mode 100644 index d840dee91..000000000 --- a/etc/docker/README.md +++ /dev/null @@ -1,37 +0,0 @@ -## Running wpantund from a Docker container: - -For a device that has a Thread radio attached to port `/dev/ttyUSB0`, start `wpantund` as follows: - -``` -docker run --rm --detach -e "OPENTHREAD_DEVICE_PORT=/dev/ttyUSB0" --cap-add=NET_ADMIN --device=/dev/ttyUSB0 --name=wpantund openthread/wpantund -``` - -Once `wpantund` is running, one can control the Thread interface with `wpanctl` as follows: - -``` -docker exec -it wpantund wpanctl -``` - -## Content - -arm32v7_ubuntu_wpantund - -- `wpantund` running on ARMv7 (e.g. Raspberry Pi) - -x86_ubuntu_wpantund - -- `wpantund` running on x86 - -ot_sim - -- OpenThread POSIX simulator - -codelab_otsim - -- For use with the [Docker Simulation Codelab](https://codelabs.developers.google.com/codelabs/openthread-simulation/), contains the OpenThread POSIX example and `wpantund` pre-built and ready to use. - -environment - -- Development environment with the GNU toolchain and all required OpenThread dependencies installed. OpenThread is not built in this image. - -Images built from these Dockerfiles are available to pull from [Docker Hub](https://hub.docker.com/u/openthread/). See [Docker Support on openthread.io](https://openthread.io/guides#docker_support) for more information. diff --git a/etc/docker/arm32v7_ubuntu_wpantund/Dockerfile b/etc/docker/arm32v7_ubuntu_wpantund/Dockerfile deleted file mode 100644 index d53b04329..000000000 --- a/etc/docker/arm32v7_ubuntu_wpantund/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -# Ubuntu image with tools required to build OpenThread -FROM arm32v7/ubuntu:18.04 as wpantund-dev - -LABEL maintainer="Marcin K Szczodrak" - -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -RUN apt-get --no-install-recommends install -y build-essential git make autoconf autoconf-archive \ - automake dbus libtool gcc g++ libreadline-dev libdbus-1-dev libboost-dev - -# wpantund -RUN mkdir -p ~/src && \ - cd ~/src && \ - git clone --recursive https://github.com/openthread/wpantund.git && \ - cd wpantund && \ - git checkout full/master && \ - ./configure --sysconfdir=/etc --enable-shared=no && \ - make && \ - make install - -#FROM debian:stretch-slim -FROM arm32v7/ubuntu:18.04 - -LABEL maintainer="Marcin K Szczodrak" - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update - -RUN apt-get --no-install-recommends install -y libdbus-1-3 libreadline-dev net-tools - -RUN mkdir -p /dev/net && \ - mknod /dev/net/tun c 10 200 && \ - chmod 600 /dev/net/tun - -COPY --from=wpantund-dev /usr/local/share/man/man1/wpanctl.1 /usr/local/share/man/man1/wpanctl.1 -COPY --from=wpantund-dev /usr/local/share/man/man1/wpantund.1 /usr/local/share/man/man1/wpantund.1 -COPY --from=wpantund-dev /usr/local/share/wpantund /usr/local/share/wpantund -COPY --from=wpantund-dev /usr/local/include/wpantund /usr/local/include/wpantund -COPY --from=wpantund-dev /usr/local/bin/wpanctl /usr/local/bin/wpanctl -COPY --from=wpantund-dev /usr/local/sbin/wpantund /usr/local/sbin/wpantund -COPY --from=wpantund-dev /etc/dbus-1/system.d/wpantund.conf /etc/dbus-1/system.d/wpantund.conf -COPY --from=wpantund-dev /etc/wpantund.conf /etc/wpantund.conf - -ENTRYPOINT mkdir -p /dev/net && mknod /dev/net/tun c 10 200 && chmod 600 /dev/net/tun && \ - service dbus start && \ - start-stop-daemon --start --background --quiet --exe /usr/local/sbin/wpantund -- -s $OPENTHREAD_DEVICE_PORT && \ - tail -F /dev/null - diff --git a/etc/docker/ot_sim/Dockerfile b/etc/docker/ot_sim/Dockerfile deleted file mode 100644 index 26984ccfb..000000000 --- a/etc/docker/ot_sim/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM alpine:3.6 as openthread-dev -LABEL maintainer="Marcin K Szczodrak" - -RUN apk add -U autoconf automake ca-certificates flex git g++ libtool linux-headers make - -# openthread -RUN git clone --recursive https://github.com/openthread/openthread.git && \ - cd /openthread && \ - ./bootstrap && \ - make -f examples/Makefile-simulation - - -FROM alpine:3.6 -LABEL maintainer="Marcin K Szczodrak" - -RUN apk add --no-cache libstdc++ -COPY --from=openthread-dev /openthread/output/x86_64-unknown-linux-gnu/bin/ot-cli-ftd /bin/ot-cli-ftd -COPY --from=openthread-dev /openthread/output/x86_64-unknown-linux-gnu/bin/ot-cli-mtd /bin/ot-cli-mtd -RUN ln -s /bin/ot-cli-ftd /bin/node diff --git a/etc/docker/ot_sim/README.md b/etc/docker/ot_sim/README.md deleted file mode 100644 index 62bcb789a..000000000 --- a/etc/docker/ot_sim/README.md +++ /dev/null @@ -1,47 +0,0 @@ -## Starting simulator - -To start the OpenThread simulator, run: - -``` -docker run --rm -d --name otsim openthread/simulation tail -F /dev/null -``` - -or - -``` -./start_sim -``` - -This runs in background a docker container with environment setup to simulate OpenThread nodes. - -## Adding a Thread node - -To start simulating an OpenThread node #1, run: - -``` -docker exec -it otsim node 1 -``` - -or - -``` -./add_node 1 -``` - -This runs a program called node, which is an OpenThread FTD binary, inside the docker container's simulator environment. - -## Stopping simulator - -To stop the OpenThread simualtor, run: - -``` -docker stop otsim -``` - -or - -``` -./stop_sim -``` - -This stop the docker daemon process. diff --git a/etc/docker/ot_sim/add_node b/etc/docker/ot_sim/add_node deleted file mode 100755 index 223045560..000000000 --- a/etc/docker/ot_sim/add_node +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker exec -it otsim node "$1" diff --git a/etc/docker/ot_sim/start_sim b/etc/docker/ot_sim/start_sim deleted file mode 100755 index 485d0dad3..000000000 --- a/etc/docker/ot_sim/start_sim +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker run --rm -d --name otsim openthread/simulation tail -F /dev/null diff --git a/etc/docker/ot_sim/stop_sim b/etc/docker/ot_sim/stop_sim deleted file mode 100755 index 0446362cc..000000000 --- a/etc/docker/ot_sim/stop_sim +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -docker stop otsim diff --git a/etc/docker/x86_ubuntu_wpantund/Dockerfile b/etc/docker/x86_ubuntu_wpantund/Dockerfile deleted file mode 100644 index a176140fb..000000000 --- a/etc/docker/x86_ubuntu_wpantund/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -# Ubuntu image with tools required to build OpenThread -FROM ubuntu:18.04 as wpantund-dev - -LABEL maintainer="Marcin K Szczodrak" - -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -RUN apt-get --no-install-recommends install -y build-essential git make autoconf autoconf-archive \ - automake dbus libtool gcc g++ libreadline-dev libdbus-1-dev libboost-dev - -# wpantund -RUN mkdir -p ~/src && \ - cd ~/src && \ - git clone --recursive https://github.com/openthread/wpantund.git && \ - cd wpantund && \ - git checkout full/master && \ - ./configure --sysconfdir=/etc --enable-shared=no && \ - make && \ - make install - -#FROM debian:stretch-slim -FROM ubuntu:18.04 - -LABEL maintainer="Marcin K Szczodrak" - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update - -RUN apt-get --no-install-recommends install -y libdbus-1-3 libreadline7 net-tools - -RUN mkdir -p /dev/net && \ - mknod /dev/net/tun c 10 200 && \ - chmod 600 /dev/net/tun - -COPY --from=wpantund-dev /usr/local/share/man/man1/wpanctl.1 /usr/local/share/man/man1/wpanctl.1 -COPY --from=wpantund-dev /usr/local/share/man/man1/wpantund.1 /usr/local/share/man/man1/wpantund.1 -COPY --from=wpantund-dev /usr/local/share/wpantund /usr/local/share/wpantund -COPY --from=wpantund-dev /usr/local/include/wpantund /usr/local/include/wpantund -COPY --from=wpantund-dev /usr/local/bin/wpanctl /usr/local/bin/wpanctl -COPY --from=wpantund-dev /usr/local/sbin/wpantund /usr/local/sbin/wpantund -COPY --from=wpantund-dev /etc/dbus-1/system.d/wpantund.conf /etc/dbus-1/system.d/wpantund.conf -COPY --from=wpantund-dev /etc/wpantund.conf /etc/wpantund.conf - -ENTRYPOINT mkdir -p /dev/net && mknod /dev/net/tun c 10 200 && chmod 600 /dev/net/tun && \ - service dbus start && \ - start-stop-daemon --start --background --quiet --exe /usr/local/sbin/wpantund -- -s $OPENTHREAD_DEVICE_PORT && \ - tail -F /dev/null -