You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by oz...@apache.org on 2017/01/29 16:17:16 UTC
nifi git commit: NIFI-3314 Adjusting Dockerfile for Docker Hub to use
defaults for ARGs such that it does not need supporting build script. Making
use of openjdk base image as the java image has been deprecated.
Repository: nifi
Updated Branches:
refs/heads/master 63c763885 -> 67e245966
NIFI-3314 Adjusting Dockerfile for Docker Hub to use defaults for ARGs
such that it does not need supporting build script. Making use of
openjdk base image as the java image has been deprecated.
This closes #1419
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/67e24596
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/67e24596
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/67e24596
Branch: refs/heads/master
Commit: 67e2459660c7eddac35e8f55e7e5955e6a329bbb
Parents: 63c7638
Author: Aldrin Piri <al...@apache.org>
Authored: Fri Jan 13 16:56:49 2017 -0500
Committer: Oleg Zhurakousky <ol...@suitcase.io>
Committed: Sun Jan 29 11:16:22 2017 -0500
----------------------------------------------------------------------
nifi-docker/dockerhub/Dockerfile | 8 ++++----
nifi-docker/dockermaven/Dockerfile | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/67e24596/nifi-docker/dockerhub/Dockerfile
----------------------------------------------------------------------
diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index ae273cc..cd7aaeb 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -16,12 +16,12 @@
# under the License.
#
-FROM java:8
+FROM openjdk:8
MAINTAINER Apache NiFi <de...@nifi.apache.org>
-ARG UID
-ARG GID
-ARG NIFI_VERSION
+ARG UID=1000
+ARG GID=50
+ARG NIFI_VERSION=1.2.0
ENV NIFI_BASE_DIR /opt/nifi
ENV NIFI_HOME $NIFI_BASE_DIR/nifi-$NIFI_VERSION
http://git-wip-us.apache.org/repos/asf/nifi/blob/67e24596/nifi-docker/dockermaven/Dockerfile
----------------------------------------------------------------------
diff --git a/nifi-docker/dockermaven/Dockerfile b/nifi-docker/dockermaven/Dockerfile
index 32bb638..bb56b96 100644
--- a/nifi-docker/dockermaven/Dockerfile
+++ b/nifi-docker/dockermaven/Dockerfile
@@ -16,11 +16,11 @@
# under the License.
#
-FROM java:8
+FROM openjdk:8
MAINTAINER Apache NiFi <de...@nifi.apache.org>
-ARG UID
-ARG GID
+ARG UID=1000
+ARG GID=50
ARG NIFI_VERSION
ARG NIFI_BINARY