This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/main by this push:
new 2fe2fe7 DISPATCH-2336: Fix Dockerfiles in the dockerfile folder
(#1536)
2fe2fe7 is described below
commit 2fe2fe7feb1655bc446c05b8ef5d741068089770
Author: Jiri Daněk <[email protected]>
AuthorDate: Wed Mar 16 16:00:22 2022 +0100
DISPATCH-2336: Fix Dockerfiles in the dockerfile folder (#1536)
---
dockerfiles/Dockerfile-centos7 | 4 +-
dockerfiles/Dockerfile-fedora | 3 +-
dockerfiles/Dockerfile-fedora-only-python3 | 62 ------------------------------
dockerfiles/Dockerfile-ubuntu | 9 +++--
4 files changed, 9 insertions(+), 69 deletions(-)
diff --git a/dockerfiles/Dockerfile-centos7 b/dockerfiles/Dockerfile-centos7
index 3ddc800..c39775c 100644
--- a/dockerfiles/Dockerfile-centos7
+++ b/dockerfiles/Dockerfile-centos7
@@ -64,5 +64,5 @@ RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install
# RUN ctest -VV
# Start the dispatch router
-#ENTRYPOINT ["qdrouterd"]
-CMD ["/bin/bash"]
+ENTRYPOINT ["qdrouterd"]
+#CMD ["/bin/bash"]
diff --git a/dockerfiles/Dockerfile-fedora b/dockerfiles/Dockerfile-fedora
index dd00631..fb3b0bd 100644
--- a/dockerfiles/Dockerfile-fedora
+++ b/dockerfiles/Dockerfile-fedora
@@ -30,12 +30,11 @@ FROM fedora:latest
MAINTAINER "[email protected]"
# Install required packages. Some in this list are from proton's INSTALL.md
(https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are
from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README)
-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 curl
+RUN dnf -y install gcc gcc-c++ cmake libuuid-devel openssl-devel
cyrus-sasl-devel cyrus-sasl-plain cyrus-sasl-gssapi swig git make valgrind
emacs libwebsockets-devel python3-devel curl
# 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
-WORKDIR /main
WORKDIR /main/qpid-proton/build
# make and install proton
diff --git a/dockerfiles/Dockerfile-fedora-only-python3
b/dockerfiles/Dockerfile-fedora-only-python3
deleted file mode 100644
index 3d4c8db..0000000
--- a/dockerfiles/Dockerfile-fedora-only-python3
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# Downloads and installs apache proton and qpid dispatch on the latest version
of Fedora and starts the dispatch router
-# /main is the top level folder under which proton (/main/qpid-proton/) and
dispatch (/main/qpid-dispatch) source code is downloaded from github
-# /usr/local/lib64 is the folder in which the proton artifacts are installed.
-# /usr/local/sbin is the folder in which dispatch executable installed
-# Copy this docker file to your local folder. Build the docker file like this
- sudo docker build -t <username>/dispatch --file=Dockerfile-fedora . (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 Fedora from dockerhub
-FROM fedora:latest
-
-MAINTAINER "[email protected]"
-
-# Install all the required packages. Some in this list were picked off from
proton's INSTALL.md
(https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are
from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README)
-RUN dnf -y install gcc cmake libuuid-devel openssl-devel cyrus-sasl-devel
cyrus-sasl-plain cyrus-sasl-gssapi cyrus-sasl-md5 swig java-1.8.0-openjdk-devel
git make doxygen valgrind emacs libuv libuv-devel libwebsockets-devel
-
-# Remove python2 if it is already there. We want this environment to contain
only python3
-RUN dnf -y remove python2
-RUN dnf -y install python3-devel
-RUN dnf clean all -y
-
-RUN alternatives --install /usr/bin/python python /usr/bin/python3 1
-RUN alternatives --install /usr/bin/unit2 unit2 /usr/bin/unit2-3 1
-
-# 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
-
-WORKDIR /main/qpid-proton/build
-
-# make and install proton
-RUN cmake .. -DSYSINSTALL_BINDINGS=ON -DCMAKE_INSTALL_PREFIX=/usr
-DSYSINSTALL_PYTHON=ON && make install
-
-# Clone the qpid-dispatch git repo
-RUN cd /main && git clone
https://gitbox.apache.org/repos/asf/qpid-dispatch.git && mkdir
/main/qpid-dispatch/build
-
-WORKDIR /main/qpid-dispatch/build
-RUN cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make install
-
-# Uncomment the following line if you would like to run all the dispatch unit
tests and system tests.
-# RUN ctest -VV
-
-# Start the dispatch router
-CMD ["qdrouterd"]
-#CMD ["/bin/bash"]
diff --git a/dockerfiles/Dockerfile-ubuntu b/dockerfiles/Dockerfile-ubuntu
index 72a461f..7120cb7 100644
--- a/dockerfiles/Dockerfile-ubuntu
+++ b/dockerfiles/Dockerfile-ubuntu
@@ -16,14 +16,17 @@
# 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 trusty Ubuntu from dockerhub
-FROM ubuntu:latest
+# Gets the Ubuntu from dockerhub
+FROM ubuntu:focal
MAINTAINER "[email protected]"
+
ARG DEBIAN_FRONTEND=noninteractive
+
# Install all the required packages. Some in this list were picked off from
proton's INSTALL.md
(https://github.com/apache/qpid-proton/blob/main/INSTALL.md) and the rest are
from dispatch (https://github.com/apache/qpid-dispatch/blob/main/README)
RUN apt-get update && \
apt-get install -y curl gcc g++ automake libwebsockets-dev libtool
zlib1g-dev cmake libsasl2-dev libssl-dev python3-dev libuv1-dev sasl2-bin swig
maven git && \
@@ -40,7 +43,7 @@ WORKDIR /qpid-dispatch
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
-ENV PYTHONPATH=/usr/lib/python2.7/site-packages
+ENV PYTHONPATH=/usr/lib/python3.8/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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
