You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2017/11/17 20:35:56 UTC
nifi-minifi-cpp git commit: MINIFICPP-310 Move to stable 3.5 Alpine
release and fix up build-time deps,
including the use of rocksdb from thirdparty rather than sys package,
and adding python-dev for the scripting extensions
Repository: nifi-minifi-cpp
Updated Branches:
refs/heads/master 1658b9c9f -> 8b7d76ade
MINIFICPP-310 Move to stable 3.5 Alpine release and fix up build-time deps, including the use of rocksdb from thirdparty rather than sys package, and adding python-dev for the scripting extensions
This closes #192.
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/8b7d76ad
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/8b7d76ad
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/8b7d76ad
Branch: refs/heads/master
Commit: 8b7d76adeeb7a1a343cf1bcc754c48101986881f
Parents: 1658b9c
Author: Andrew I. Christianson <an...@andyic.org>
Authored: Thu Nov 16 21:53:21 2017 -0500
Committer: Aldrin Piri <al...@apache.org>
Committed: Fri Nov 17 15:35:12 2017 -0500
----------------------------------------------------------------------
docker/Dockerfile | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8b7d76ad/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 641f0e2..0892c6f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@
# First stage: the build environment
# Edge required for rocksdb
-FROM alpine:edge AS builder
+FROM alpine:3.5 AS builder
MAINTAINER Apache NiFi <de...@nifi.apache.org>
ARG UID
@@ -27,8 +27,6 @@ ARG MINIFI_VERSION
ARG MINIFI_SOURCE_CODE
# Install the system dependencies needed for a build
-# Add testing repo for rocksdb
-RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories
RUN apk --update --no-cache upgrade && apk --update --no-cache add gcc \
g++ \
make \
@@ -38,14 +36,14 @@ RUN apk --update --no-cache upgrade && apk --update --no-cache add gcc \
boost-dev \
vim \
util-linux-dev \
- rocksdb-dev \
curl-dev \
cmake \
git \
unzip \
gpsd-dev \
libressl-dev \
- zlib-dev
+ zlib-dev \
+ python-dev
ENV USER minificpp
ENV MINIFI_BASE_DIR /opt/minifi
@@ -66,12 +64,12 @@ RUN cd $MINIFI_BASE_DIR \
&& mkdir build \
&& cd build \
&& cmake .. \
- && make package \
+ && make -j8 package \
&& tar -xzvf $MINIFI_BASE_DIR/build/nifi-minifi-cpp-$MINIFI_VERSION-bin.tar.gz -C $MINIFI_BASE_DIR
# Second stage: the runtime image
# Edge required for rocksdb
-FROM alpine:edge
+FROM alpine:3.5
ARG UID
ARG GID
@@ -83,11 +81,11 @@ RUN echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/reposit
RUN apk --update --no-cache upgrade && apk add --update --no-cache \
util-linux \
- rocksdb \
curl \
unzip \
gpsd \
libressl \
+ python \
zlib
# Start MiNiFi CPP in the foreground