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 2022/01/19 17:52:54 UTC
[nifi] branch main updated: NIFI-9597 This closes #5681. Fix Dockerfile URLs
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3f69eec NIFI-9597 This closes #5681. Fix Dockerfile URLs
3f69eec is described below
commit 3f69eeceb2baa5706f37f2b98e6a92b76728ff4f
Author: Kevin Doran <kd...@apache.org>
AuthorDate: Wed Jan 19 12:23:57 2022 -0500
NIFI-9597 This closes #5681. Fix Dockerfile URLs
Update Docker Hub Dockerfiles for MiNiFi, MiNiFi C2, and Registry
to reflect new default binary download locations.
Also, make mirror base url configurable to streamline the RM process.
Signed-off-by: Joe Witt <jo...@apache.org>
---
minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile | 11 +++++++----
minifi/minifi-docker/dockerhub/Dockerfile | 11 +++++++----
.../nifi-registry-docker/dockerhub/Dockerfile | 12 ++++++------
nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub | 12 +++++++-----
4 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
index 05c2d51..fa0da40 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
@@ -17,15 +17,18 @@
#
FROM openjdk:8-jre-alpine
-MAINTAINER Apache MiNiFi <de...@nifi.apache.org>
+LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
+LABEL site="https://nifi.apache.org"
ARG UID=1000
ARG GID=50
-ARG MINIFI_C2_VERSION=0.6.0
+ARG MINIFI_C2_VERSION=1.15.3
+ARG MIRROR=https://archive.apache.org/dist
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/nifi/minifi/$MINIFI_C2_VERSION/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz
+ENV MINIFI_C2_HOME ${MINIFI_C2_BASE_DIR}/minifi-c2-${MINIFI_C2_VERSION}
+ENV MINIFI_C2_BINARY_PATH nifi/${MINIFI_C2_VERSION}/minifi-c2-${MINIFI_C2_VERSION}-bin.tar.gz
+ENV MINIFI_C2_BINARY_URL ${MIRROR}/${MINIFI_C2_BINARY_PATH}
# Setup MiNiFi user
RUN addgroup -g $GID c2 || groupmod -n c2 `getent group $GID | cut -d: -f1`
diff --git a/minifi/minifi-docker/dockerhub/Dockerfile b/minifi/minifi-docker/dockerhub/Dockerfile
index 98ea27a..1e960ec 100644
--- a/minifi/minifi-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-docker/dockerhub/Dockerfile
@@ -17,15 +17,18 @@
#
FROM openjdk:8-jre-alpine
-MAINTAINER Apache MiNiFi <de...@nifi.apache.org>
+LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
+LABEL site="https://nifi.apache.org"
ARG UID=1000
ARG GID=1000
-ARG MINIFI_VERSION=0.5.0
+ARG MINIFI_VERSION=1.15.3
+ARG MIRROR=https://archive.apache.org/dist
ENV MINIFI_BASE_DIR /opt/minifi
-ENV MINIFI_HOME $MINIFI_BASE_DIR/minifi-current
-ENV MINIFI_BINARY_URL https://archive.apache.org/dist/nifi/minifi/$MINIFI_VERSION/minifi-$MINIFI_VERSION-bin.tar.gz
+ENV MINIFI_HOME ${MINIFI_BASE_DIR}/minifi-current
+ENV MINIFI_BINARY_PATH nifi/${MINIFI_VERSION}/minifi-${MINIFI_VERSION}-bin.tar.gz
+ENV MINIFI_BINARY_URL ${MIRROR}/${MINIFI_BINARY_PATH}
# Setup MiNiFi user
RUN addgroup -g $GID minifi || groupmod -n minifi `getent group $GID | cut -d: -f1`
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile b/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
index 28040a0..22d0e22 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
+++ b/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
@@ -22,13 +22,13 @@ LABEL site="https://nifi.apache.org"
ARG UID=1000
ARG GID=1000
-ARG NIFI_REGISTRY_VERSION=1.14.0
+ARG NIFI_REGISTRY_VERSION=1.15.3
ARG MIRROR=https://archive.apache.org/dist
ENV NIFI_REGISTRY_BASE_DIR /opt/nifi-registry
-ENV NIFI_REGISTRY_HOME=${NIFI_REGISTRY_BASE_DIR}/nifi-registry-current
-
-ENV NIFI_REGISTRY_BINARY_URL=nifi/nifi-registry/nifi-registry-${NIFI_REGISTRY_VERSION}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz
+ENV NIFI_REGISTRY_HOME ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-current
+ENV NIFI_REGISTRY_BINARY_PATH nifi/${NIFI_REGISTRY_VERSION}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz
+ENV NIFI_REGISTRY_BINARY_URL ${MIRROR}/${NIFI_REGISTRY_BINARY_PATH}
ADD sh/ ${NIFI_REGISTRY_BASE_DIR}/scripts/
@@ -42,8 +42,8 @@ RUN groupadd -g ${GID} nifi || groupmod -n nifi `getent group ${GID} | cut -d: -
USER nifi
# Download, validate, and expand Apache NiFi-Registry binary.
-RUN curl -fSL ${MIRROR}/${NIFI_REGISTRY_BINARY_URL} -o ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz \
- && echo "$(curl ${MIRROR}/${NIFI_REGISTRY_BINARY_URL}.sha256) *${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz" | sha256sum -c - \
+RUN curl -fSL ${NIFI_REGISTRY_BINARY_URL} -o ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz \
+ && echo "$(curl ${NIFI_REGISTRY_BINARY_URL}.sha256) *${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz" | sha256sum -c - \
&& tar -xvzf ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz -C ${NIFI_REGISTRY_BASE_DIR} \
&& rm ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz \
&& mv ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION} ${NIFI_REGISTRY_HOME} \
diff --git a/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub b/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
index 627f99b..2f944e4 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
+++ b/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
@@ -17,16 +17,18 @@
#
FROM openjdk:8-jre-alpine
-LABEL maintainer "Apache NiFi <de...@nifi.apache.org>"
+LABEL maintainer="Apache NiFi <de...@nifi.apache.org>"
+LABEL site="https://nifi.apache.org"
ARG UID=1000
ARG GID=1000
-ARG NIFI_TOOLKIT_VERSION=1.5.0
+ARG NIFI_TOOLKIT_VERSION=1.15.3
ARG MIRROR=https://archive.apache.org/dist
-ENV NIFI_TOOLKIT_BASE_DIR=/opt/nifi-toolkit
-ENV NIFI_TOOLKIT_HOME=${NIFI_TOOLKIT_BASE_DIR}/nifi-toolkit-${NIFI_TOOLKIT_VERSION} \
- NIFI_TOOLKIT_BINARY_URL=${MIRROR}/nifi/${NIFI_TOOLKIT_VERSION}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz
+ENV NIFI_TOOLKIT_BASE_DIR /opt/nifi-toolkit
+ENV NIFI_TOOLKIT_HOME ${NIFI_TOOLKIT_BASE_DIR}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}
+ENV NIFI_TOOLKIT_BINARY_PATH nifi/${NIFI_TOOLKIT_VERSION}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz
+ENV NIFI_TOOLKIT_BINARY_URL ${MIRROR}/${NIFI_TOOLKIT_BINARY_PATH}
ADD sh/docker-entrypoint.sh /opt/sh/docker-entrypoint.sh