Dockers: Remove use of Ansible

OpenOverlayRouter · Apr 9, 2018 · a9a2a9b · a9a2a9b
1 parent 18ccd24
commit a9a2a9b
Show file tree

Hide file tree

Showing 6 changed files with 393 additions and 331 deletions.
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
@@ -1,15 +1,13 @@
 FROM ubuntu:16.04
 MAINTAINER alopez@ac.upc.edu
 ENV TERM=xterm
-RUN apt-get update -y && apt-get install software-properties-common -y && apt-add-repository ppa:ansible/ansible -y && apt-get update -y && apt-get install -y dialog apt-utils && apt-get install -y build-essential git-core libconfuse-dev gengetopt libcap2-bin libzmq3-dev libxml2-dev ansible iputils-ping tcpdump && apt-get autoclean && apt-get autoremove
+RUN apt-get update -y && apt-get install -y build-essential git-core libconfuse-dev gengetopt libcap2-bin libzmq3-dev libxml2-dev iputils-ping && apt-get autoclean && apt-get autoremove
 RUN git clone git://github.com/OpenOverlayRouter/oor.git
 WORKDIR /oor
 RUN make
 RUN make install
 RUN rm -rf /oor
-COPY files/*.conf /etc/
 COPY files/*.sh /tmp/
-COPY files/*.yaml /tmp/
 ENV DEBUG 0
 ENV OPMODE xTR
 ENV IPMAPRESOLVER -

diff --git a/Docker/Dockerfile_testing b/Docker/Dockerfile_testing
@@ -1,15 +1,13 @@
 FROM ubuntu:16.04
 MAINTAINER alopez@ac.upc.edu
 ENV TERM=xterm
-RUN apt-get update -y && apt-get install software-properties-common -y && apt-add-repository ppa:ansible/ansible -y && apt-get update -y && apt-get install -y dialog apt-utils && apt-get install -y build-essential git-core libconfuse-dev gengetopt libcap2-bin libzmq3-dev libxml2-dev ansible iputils-ping tcpdump && apt-get autoclean && apt-get autoremove
+RUN apt-get update -y && apt-get install -y build-essential git-core libconfuse-dev gengetopt libcap2-bin libzmq3-dev libxml2-dev iputils-ping && apt-get autoclean && apt-get autoremove
 RUN git clone git://github.com/OpenOverlayRouter/oor.git -b testing
 WORKDIR /oor
 RUN make
 RUN make install
 RUN rm -rf /oor
-COPY files/*.conf /etc/
 COPY files/*.sh /tmp/
-COPY files/*.yaml /tmp/
 ENV DEBUG 0
 ENV OPMODE xTR
 ENV IPMAPRESOLVER -
@@ -19,4 +17,4 @@ ENV IPPROXYETRV4 -
 ENV IPPROXYETRV6 -
 ENV IPV4EIDPREFFIX -
 ENV IPV6EIDPREFFIX -
-CMD /tmp/start.sh $DEBUG $OPMODE $IPMAPRESOLVER $IPMAPSERVER $KEYMAPSERVER $IPPROXYETRV4 $IPPROXYETRV6 $IPV4EIDPREFFIX $IPV6EIDPREFFIX
+CMD /tmp/start_testing.sh $DEBUG $OPMODE $IPMAPRESOLVER $IPMAPSERVER $KEYMAPSERVER $IPPROXYETRV4 $IPPROXYETRV6 $IPV4EIDPREFFIX $IPV6EIDPREFFIX
diff --git a/Docker/files/oor.conf b/Docker/files/oor.conf
diff --git a/Docker/files/oor.yaml b/Docker/files/oor.yaml