You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sz...@apache.org on 2021/06/29 10:33:09 UTC
[nifi-minifi-cpp] 02/02: MINIFICPP-1597 Downgrade CentOS base image
for CentOS 7 support
This is an automated email from the ASF dual-hosted git repository.
szaszm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 7f7e5c15e6d5a2e82b6d4ba9e34df941d4100e27
Author: Gabor Gyimesi <ga...@gmail.com>
AuthorDate: Tue Jun 29 12:26:26 2021 +0200
MINIFICPP-1597 Downgrade CentOS base image for CentOS 7 support
Closes #1117
Signed-off-by: Marton Szasz <sz...@apache.org>
---
README.md | 4 ++--
docker/centos/Dockerfile | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 5fef5f1..39c5261 100644
--- a/README.md
+++ b/README.md
@@ -490,13 +490,13 @@ $ make docker-verify
```
### Building For Other Distros
-If you have docker installed on your machine you can build for CentOS 8, Fedora 34, Ubuntu 18.04, Ubuntu 20.04, and Debian 10 via our make docker commands. The following table
+If you have docker installed on your machine you can build for CentOS 7, Fedora 34, Ubuntu 18.04, Ubuntu 20.04, and Debian 10 via our make docker commands. The following table
provides the command to build your distro and the output file in your build directory. Since the versions are limited ( except for Ubuntu ) we output the archive based on the distro's name.
| Distro | command | Output File |
| ------------- |:-------------| :-----|
-| CentOS 8 | make centos | nifi-minifi-cpp-centos-$VERSION-bin.tar.gz
+| CentOS 7 | make centos | nifi-minifi-cpp-centos-$VERSION-bin.tar.gz
| Debian 10 (buster) | make debian | nifi-minifi-cpp-debian-$VERSION-bin.tar.gz
| Fedora 34 | make fedora | nifi-minifi-cpp-fedora-$VERSION-bin.tar.gz
| Ubuntu 18.04 (bionic) | make u18 | nifi-minifi-cpp-bionic-$VERSION-bin.tar.gz
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
index b6284c1..adaba9d 100644
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -17,7 +17,7 @@
#
# First stage: the build environment
-FROM centos:8 AS build_deps
+FROM centos:7 AS build_deps
LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
ARG MINIFI_VERSION
@@ -27,7 +27,7 @@ ARG MINIFI_VERSION
ENV MINIFI_BASE_DIR /opt/minifi
ENV MINIFI_HOME $MINIFI_BASE_DIR/nifi-minifi-cpp-$MINIFI_VERSION
-RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel python36-devel gcc gcc-c++ sudo git which maven make cmake libarchive
+RUN yum -y install java-1.8.0-openjdk java-1.8.0-openjdk-devel python36-devel gcc gcc-c++ sudo git which maven make libarchive
RUN mkdir -p $MINIFI_BASE_DIR
COPY . ${MINIFI_BASE_DIR}
@@ -40,6 +40,6 @@ RUN cd $MINIFI_BASE_DIR \
&& rm -rf build \
&& mkdir build \
&& cd build \
- && cmake -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
+ && cmake3 -DUSE_SHARED_LIBS= -DENABLE_MQTT=ON -DENABLE_LIBRDKAFKA=ON -DPORTABLE=ON -DENABLE_COAP=ON -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS=true -DENABLE_JNI=$ENABLE_JNI .. \
&& make -j$(nproc) package