From 67e2459660c7eddac35e8f55e7e5955e6a329bbb Mon Sep 17 00:00:00 2001 From: Aldrin Piri Date: Fri, 13 Jan 2017 16:56:49 -0500 Subject: [PATCH] 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 --- nifi-docker/dockerhub/Dockerfile | 8 ++++---- nifi-docker/dockermaven/Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile index ae273cce3d..cd7aaeb22a 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 -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 diff --git a/nifi-docker/dockermaven/Dockerfile b/nifi-docker/dockermaven/Dockerfile index 32bb638b40..bb56b96561 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 -ARG UID -ARG GID +ARG UID=1000 +ARG GID=50 ARG NIFI_VERSION ARG NIFI_BINARY