You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2017/11/28 15:11:11 UTC
nifi-minifi git commit: MINIFI-355 This closes #94. Convert MiNiFi C2
Docker images to use alpine for more compact size.
Repository: nifi-minifi
Updated Branches:
refs/heads/master e47691c50 -> ff23b8773
MINIFI-355 This closes #94. Convert MiNiFi C2 Docker images to use alpine for more compact size.
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/ff23b877
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/ff23b877
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/ff23b877
Branch: refs/heads/master
Commit: ff23b8773163ec155a3388c51b3033ad9f14a100
Parents: e47691c
Author: Aldrin Piri <al...@apache.org>
Authored: Mon Oct 9 15:20:03 2017 -0400
Committer: joewitt <jo...@apache.org>
Committed: Tue Nov 28 10:10:56 2017 -0500
----------------------------------------------------------------------
minifi-c2/minifi-c2-docker/dockerhub/Dockerfile | 8 ++++----
minifi-c2/minifi-c2-docker/dockermaven/Dockerfile | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/ff23b877/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
----------------------------------------------------------------------
diff --git a/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile b/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
index f139052..3fb6e11 100644
--- a/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
+++ b/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
@@ -16,7 +16,7 @@
# under the License.
#
-FROM openjdk:8
+FROM openjdk:8-jre-alpine
MAINTAINER Apache MiNiFi <de...@nifi.apache.org>
ARG UID=1000
@@ -27,9 +27,9 @@ ENV MINIFI_C2_BASE_DIR /opt/minifi-c2
ENV MINIFI_C2_HOME $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION
ENV MINIFI_C2_BINARY_URL https://archive.apache.org/dist/minifi/$MINIFI_C2_VERSION/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz
-# Setup c2 user
-RUN groupadd -g $GID c2 || groupmod -n c2 `getent group $GID | cut -d: -f1`
-RUN useradd --shell /bin/bash -u $UID -g $GID -m c2
+# Setup MiNiFi user
+RUN addgroup -g $GID c2 || groupmod -n c2 `getent group $GID | cut -d: -f1`
+RUN adduser -S -H -G c2 c2
RUN mkdir -p $MINIFI_C2_HOME
# Download, validate, and expand Apache MiNiFi C2 binary.
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/ff23b877/minifi-c2/minifi-c2-docker/dockermaven/Dockerfile
----------------------------------------------------------------------
diff --git a/minifi-c2/minifi-c2-docker/dockermaven/Dockerfile b/minifi-c2/minifi-c2-docker/dockermaven/Dockerfile
index 329a110..4f909ef 100644
--- a/minifi-c2/minifi-c2-docker/dockermaven/Dockerfile
+++ b/minifi-c2/minifi-c2-docker/dockermaven/Dockerfile
@@ -16,7 +16,7 @@
# under the License.
#
-FROM openjdk:8
+FROM openjdk:8-jre-alpine
MAINTAINER Apache MiNiFi <de...@nifi.apache.org>
ARG UID=1000
@@ -28,9 +28,9 @@ ENV MINIFI_C2_BASE_DIR /opt/minifi-c2
ENV MINIFI_C2_HOME $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION
# Setup MiNiFi C2 user
-RUN groupadd -g $GID c2 || groupmod -n c2 `getent group $GID | cut -d: -f1`
-RUN useradd --shell /bin/bash -u $UID -g $GID -m c2
-RUN mkdir -p $MINIFI_C2_HOME
+RUN addgroup -g $GID c2 || groupmod -n c2 `getent group $GID | cut -d: -f1`
+RUN adduser -S -H -G c2 c2
+RUN mkdir -p $MINIFI_C2_HOME
ADD $MINIFI_C2_BINARY $MINIFI_C2_BASE_DIR
RUN chown -R c2:c2 $MINIFI_C2_HOME