Repository: qpid-dispatch Updated Branches: refs/heads/master fd27ed423 -> d5aedafe4
DISPATCH-766 - Updated Dockerfile-ubuntu to include libwebsockets. Got rid of some unnecessary libraries Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/d5aedafe Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/d5aedafe Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/d5aedafe Branch: refs/heads/master Commit: d5aedafe42dca0fa36dbc6104bc8e5cfbe66b130 Parents: fd27ed4 Author: Ganesh Murthy <gmur...@redhat.com> Authored: Mon May 8 11:19:50 2017 -0400 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Mon May 8 11:19:50 2017 -0400 ---------------------------------------------------------------------- dockerfiles/Dockerfile-ubuntu | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/d5aedafe/dockerfiles/Dockerfile-ubuntu ---------------------------------------------------------------------- diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu index 5b72a05..9cc8b9b 100644 --- a/dockerfiles/Dockerfile-ubuntu +++ b/dockerfiles/Dockerfile-ubuntu @@ -16,34 +16,37 @@ # specific language governing permissions and limitations # under the License. # +# Copy this docker file to your local folder. Build the docker file like this - sudo docker build -t <username>/dispatch --file=Dockerfile-ubuntu . (don't miss the dot at the end) +# To run it - sudo docker run -i -t <username>/dispatch (this will launch the dispatch router) -# Gets the latest Ubuntu from dockerhub +# Gets the trusty Ubuntu from dockerhub FROM ubuntu:latest MAINTAINER "d...@qpid.apache.org" # Install all the required packages. Some in this list were picked off from proton's INSTALL.md (https://github.com/apache/qpid-proton/blob/master/INSTALL.md) and the rest are from dispatch (https://github.com/apache/qpid-dispatch/blob/master/README) -RUN apt-get update && apt-get -y install gcc cmake cmake-curses-gui uuid-dev libssl-dev libsasl2-2 libsasl2-dev sasl2-bin swig python-dev ruby-dev libperl-dev git make doxygen valgrind emacs +RUN apt-get update +RUN apt-get -y install automake libtool cmake libsasl2-dev libssl-dev python python-dev libuv1-dev sasl2-bin swig maven git -# Create a main directory and clone the qpid-proton repo from github -RUN mkdir /main && cd /main && git clone https://github.com/apache/qpid-proton.git && cd /main/qpid-proton && mkdir /main/qpid-proton/build +RUN git clone https://git-wip-us.apache.org/repos/asf/qpid-dispatch.git && cd /qpid-dispatch && git submodule add -b v2.1-stable https://github.com/warmcat/libwebsockets && git submodule add https://git-wip-us.apache.org/repos/asf/qpid-proton.git && git submodule update --init -WORKDIR /main/qpid-proton/build +WORKDIR /qpid-dispatch -# make and install proton -RUN cmake .. -DSYSINSTALL_BINDINGS=ON -DCMAKE_INSTALL_PREFIX=/usr -DSYSINSTALL_PYTHON=ON && make install +RUN mkdir libwebsockets/build && cd /qpid-dispatch/libwebsockets/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install -# Clone the qpid-dispatch git repo -RUN cd /main && git clone https://github.com/apache/qpid-dispatch.git && mkdir /main/qpid-dispatch/build +WORKDIR /qpid-dispatch -WORKDIR /main/qpid-dispatch/build -RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install +RUN mkdir qpid-proton/build && cd qpid-proton/build && cmake .. -DSYSINSTALL_BINDINGS=ON -DCMAKE_INSTALL_PREFIX=/usr -DSYSINSTALL_PYTHON=ON && make install -# Add site-packages to the PYTHONPATH environment variable. This is because Ubuntu does not list the site-packages folder in the sys.path +WORKDIR /qpid-dispatch + +RUN /bin/bash -c "mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_VALGRIND=NO && cmake --build . --target install && cd /qpid-dispatch/build && ctest -VV" + +-# Add site-packages to the PYTHONPATH environment variable. This is because Ubuntu does not list the site-packages folder in the sys.path ENV PYTHONPATH=/usr/lib/python2.7/site-packages -# Uncomment the following line if you would like to run all the dispatch unit tests and system tests. -# RUN ctest -VV +WORKDIR /qpid-dispatch # Start the dispatch router -CMD ["qdrouterd"] \ No newline at end of file +CMD ["qdrouterd"] +#CMD ["/bin/bash"] \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
