Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <joewitt@apache.org>
This commit is contained in:
Kevin Doran 2022-01-19 12:23:57 -05:00 committed by Joe Witt
parent 48c8193c4c
commit 3f69eeceb2
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
View File

@ -17,15 +17,18 @@
#
FROM openjdk:8-jre-alpine
MAINTAINER Apache MiNiFi <dev@nifi.apache.org>
LABEL maintainer="Apache NiFi <dev@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`

11
minifi/minifi-docker/dockerhub/Dockerfile
View File

@ -17,15 +17,18 @@
#
FROM openjdk:8-jre-alpine
MAINTAINER Apache MiNiFi <dev@nifi.apache.org>
LABEL maintainer="Apache NiFi <dev@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`

12
nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
View File

@ -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} \

12
nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
View File

@ -17,16 +17,18 @@
#
FROM openjdk:8-jre-alpine
LABEL maintainer "Apache NiFi <dev@nifi.apache.org>"
LABEL maintainer="Apache NiFi <dev@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