qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmur...@apache.org
Subject [qpid-dispatch] branch master updated: DISPATCH-1552 - Added c++ compiler to centos6, centos7, ubuntu and fedora dockerfiles. This closes #669
Date Wed, 22 Jan 2020 13:54:22 GMT
This is an automated email from the ASF dual-hosted git repository.

gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 45b033c  DISPATCH-1552 - Added c++ compiler to centos6, centos7, ubuntu and fedora
dockerfiles. This closes #669
45b033c is described below

commit 45b033cb669db0db4886f27897eb51d002ba41b2
Author: Ganesh Murthy <gmurthy@apache.org>
AuthorDate: Tue Jan 21 15:35:25 2020 -0500

    DISPATCH-1552 - Added c++ compiler to centos6, centos7, ubuntu and fedora dockerfiles.
This closes #669
---
 Dockerfile                     | 3 +--
 dockerfiles/Dockerfile-centos6 | 2 +-
 dockerfiles/Dockerfile-fedora  | 2 +-
 dockerfiles/Dockerfile-ubuntu  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b39bb62..ff4430f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ MAINTAINER "dev@qpid.apache.org"
 RUN yum -y install epel-release
 
 # now install the rest of the packages
-RUN yum -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 && yum clean all -y
+RUN yum -y install gcc gcc-c++ 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 && yum clean all -y
 
 # 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
@@ -69,4 +69,3 @@ RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install
 
 # Start the dispatch router
 ENTRYPOINT ["qdrouterd"]
-
diff --git a/dockerfiles/Dockerfile-centos6 b/dockerfiles/Dockerfile-centos6
index 71f3c7c..5451d92 100644
--- a/dockerfiles/Dockerfile-centos6
+++ b/dockerfiles/Dockerfile-centos6
@@ -47,7 +47,7 @@ MAINTAINER "dev@qpid.apache.org"
 RUN yum -y install epel-release
 
 # now install the rest of the packages
-RUN yum -y install gcc cmake libuuid-devel openssl-devel python-unittest2 python-setuptools
python-argparse 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
&& yum clean all -y
+RUN yum -y install gcc gcc-c++ cmake libuuid-devel openssl-devel python-unittest2 python-setuptools
python-argparse 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
&& yum clean all -y
 
 # 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
diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora
index 79d641f..685e4c9 100644
--- a/dockerfiles/Dockerfile-fedora
+++ b/dockerfiles/Dockerfile-fedora
@@ -30,7 +30,7 @@ FROM fedora:latest
 MAINTAINER "dev@qpid.apache.org"
 
 # Install required packages. Some in this list are 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 openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi
cyrus-sasl-md5 swig java-1.8.0-openjdk-devel git make valgrind emacs libwebsockets-devel python-devel
+RUN dnf -y install gcc gcc-c++ cmake openssl-devel cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi
cyrus-sasl-md5 swig java-1.8.0-openjdk-devel git make valgrind emacs libwebsockets-devel python-devel
 
 # Create a main directory and clone the qpid-proton repo from github
 RUN mkdir /main && cd /main && git clone https://gitbox.apache.org/repos/asf/qpid-proton.git
 && cd /main/qpid-proton && mkdir /main/qpid-proton/build
diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu
index 0224340..4455187 100644
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/dockerfiles/Dockerfile-ubuntu
@@ -26,7 +26,7 @@ MAINTAINER "dev@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 install -y automake libtool zlib1g-dev cmake libsasl2-dev libssl-dev python python-dev
libuv1-dev sasl2-bin swig maven git && \
+    apt-get install -y gcc g++ automake libtool zlib1g-dev cmake libsasl2-dev libssl-dev
python python-dev libuv1-dev sasl2-bin swig maven git && \
     apt-get -y clean
 
 RUN git clone https://gitbox.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://gitbox.apache.org/repos/asf/qpid-proton.git && git submodule
update --init


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message