Skip to content

Commit

Permalink
NIFI-3314 Adjusting Dockerfile for Docker Hub to use defaults for ARGs
Browse files Browse the repository at this point in the history
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
  • Loading branch information
apiri authored and olegz committed Jan 29, 2017
1 parent 63c7638 commit 67e2459
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions nifi-docker/dockerhub/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
# under the License.
#

FROM java:8
FROM openjdk:8
MAINTAINER Apache NiFi <dev@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
Expand Down
6 changes: 3 additions & 3 deletions nifi-docker/dockermaven/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
# under the License.
#

FROM java:8
FROM openjdk:8
MAINTAINER Apache NiFi <dev@nifi.apache.org>

ARG UID
ARG GID
ARG UID=1000
ARG GID=50
ARG NIFI_VERSION
ARG NIFI_BINARY

Expand Down

0 comments on commit 67e2459

Please sign in to comment.