Repository: qpid-dispatch Updated Branches: refs/heads/master 17679d964 -> f0b2e52ea
DISPATCH-931: update dockerfiles with new dependency and fix syntax error. This closes #260 Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f0b2e52e Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f0b2e52e Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f0b2e52e Branch: refs/heads/master Commit: f0b2e52eafeb8a46397acf8fb5bc2f48342b88ba Parents: 17679d9 Author: Kenneth Giusti <kgiu...@apache.org> Authored: Thu Feb 22 10:34:04 2018 -0500 Committer: Ganesh Murthy <gmur...@redhat.com> Committed: Thu Feb 22 12:00:26 2018 -0500 ---------------------------------------------------------------------- dockerfiles/Dockerfile-fedora | 2 +- dockerfiles/Dockerfile-ubuntu | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f0b2e52e/dockerfiles/Dockerfile-fedora ---------------------------------------------------------------------- diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora index 179ea13..2f23e75 100644 --- a/dockerfiles/Dockerfile-fedora +++ b/dockerfiles/Dockerfile-fedora @@ -30,7 +30,7 @@ FROM fedora: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 dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig python-devel java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel libwebsockets-devel +RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig python-devel java-1.8.0-openjdk-devel git make doxygen valgrind emacs libuv libuv-devel libwebsockets-devel python-unittest2 && dnf clean all -y # Create a main directory and clone the qpid-proton repo from github RUN mkdir /main && cd /main && git clone https://git-wip-us.apache.org/repos/asf/qpid-proton.git && cd /main/qpid-proton && mkdir /main/qpid-proton/build http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f0b2e52e/dockerfiles/Dockerfile-ubuntu ---------------------------------------------------------------------- diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu index 9cc8b9b..efe0ff9 100644 --- a/dockerfiles/Dockerfile-ubuntu +++ b/dockerfiles/Dockerfile-ubuntu @@ -25,8 +25,9 @@ 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 -RUN apt-get -y install automake libtool cmake libsasl2-dev libssl-dev python python-dev libuv1-dev sasl2-bin swig maven git +RUN apt-get update && \ + apt-get install -y automake libtool cmake libsasl2-dev libssl-dev python python-dev libuv1-dev sasl2-bin swig maven git python-unittest2 && \ + apt-get -y clean 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 @@ -40,13 +41,16 @@ RUN mkdir qpid-proton/build && cd qpid-proton/build && cmake .. -DSYSINSTALL_BIN 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" +RUN mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_VALGRIND=NO && cmake --build . --target install --# Add site-packages to the PYTHONPATH environment variable. This is because Ubuntu does not list the site-packages folder in the sys.path +# 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 cd /qpid-dispatch/build && ctest -VV + WORKDIR /qpid-dispatch # Start the dispatch router CMD ["qdrouterd"] -#CMD ["/bin/bash"] \ No newline at end of file +#CMD ["/bin/bash"] --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
