This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 70b73f63fd NIFI-10323 Switch Dockerfiles to use zip artifacts
70b73f63fd is described below
commit 70b73f63fd77d106d673c1a876ab95b902943668
Author: Kevin Doran <[email protected]>
AuthorDate: Tue Aug 2 11:47:06 2022 -0400
NIFI-10323 Switch Dockerfiles to use zip artifacts
This closes #6266
Signed-off-by: David Handermann <[email protected]>
---
minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile | 13 +++++++------
minifi/minifi-docker/dockerhub/Dockerfile | 13 +++++++------
.../nifi-registry-docker/dockerhub/Dockerfile | 15 ++++++++-------
nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub | 13 +++++++------
4 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
index 1d7397c21e..baf06dbeab 100644
--- a/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-c2/minifi-c2-docker/dockerhub/Dockerfile
@@ -22,12 +22,13 @@ LABEL site="https://nifi.apache.org";
ARG UID=1000
ARG GID=50
-ARG MINIFI_C2_VERSION=1.16.0
+ARG MINIFI_C2_VERSION=1.17.0
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_PATH
nifi/${MINIFI_C2_VERSION}/minifi-c2-${MINIFI_C2_VERSION}-bin.tar.gz
+ENV MINIFI_C2_BINARY minifi-c2-${MINIFI_C2_VERSION}-bin.zip
+ENV MINIFI_C2_BINARY_PATH nifi/${MINIFI_C2_VERSION}/${MINIFI_C2_BINARY}
ENV MINIFI_C2_BINARY_URL ${MIRROR}/${MINIFI_C2_BINARY_PATH}
# Setup MiNiFi user
@@ -37,10 +38,10 @@ RUN mkdir -p $MINIFI_C2_HOME
# Download, validate, and expand Apache MiNiFi C2 binary.
RUN apk add curl \
- && curl -fSL $MINIFI_C2_BINARY_URL -o
$MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz \
- && echo "$(curl $MINIFI_C2_BINARY_URL.sha256)
*$MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz" | sha256sum -c - \
- && tar -xvzf
$MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz -C
$MINIFI_C2_BASE_DIR \
- && rm $MINIFI_C2_BASE_DIR/minifi-c2-$MINIFI_C2_VERSION-bin.tar.gz
+ && curl -fSL $MINIFI_C2_BINARY_URL -o
$MINIFI_C2_BASE_DIR/${MINIFI_C2_BINARY} \
+ && echo "$(curl $MINIFI_C2_BINARY_URL.sha256)
*$MINIFI_C2_BASE_DIR/${MINIFI_C2_BINARY}" | sha256sum -c - \
+ && unzip $MINIFI_C2_BASE_DIR/${MINIFI_C2_BINARY} -d $MINIFI_C2_BASE_DIR
\
+ && rm $MINIFI_C2_BASE_DIR/${MINIFI_C2_BINARY}
RUN chown -R c2:c2 $MINIFI_C2_HOME
diff --git a/minifi/minifi-docker/dockerhub/Dockerfile
b/minifi/minifi-docker/dockerhub/Dockerfile
index 773b9c22a2..20bb05174c 100644
--- a/minifi/minifi-docker/dockerhub/Dockerfile
+++ b/minifi/minifi-docker/dockerhub/Dockerfile
@@ -22,12 +22,13 @@ LABEL site="https://nifi.apache.org";
ARG UID=1000
ARG GID=1000
-ARG MINIFI_VERSION=1.16.0
+ARG MINIFI_VERSION=1.17.0
ARG MIRROR=https://archive.apache.org/dist
ENV MINIFI_BASE_DIR /opt/minifi
ENV MINIFI_HOME ${MINIFI_BASE_DIR}/minifi-current
-ENV MINIFI_BINARY_PATH
nifi/${MINIFI_VERSION}/minifi-${MINIFI_VERSION}-bin.tar.gz
+ENV MINIFI_BINARY minifi-${MINIFI_VERSION}-bin.zip
+ENV MINIFI_BINARY_PATH nifi/${MINIFI_VERSION}/${MINIFI_BINARY}
ENV MINIFI_BINARY_URL ${MIRROR}/${MINIFI_BINARY_PATH}
# Setup MiNiFi user
@@ -40,10 +41,10 @@ RUN apk --no-cache add curl
ADD sh/ ${MINIFI_BASE_DIR}/scripts/
# Download, validate, and expand Apache MiNiFi binary.
-RUN curl -fSL $MINIFI_BINARY_URL -o
$MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz \
- && echo "$(curl $MINIFI_BINARY_URL.sha256)
*$MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz" | sha256sum -c - \
- && tar -xvzf $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz -C
$MINIFI_BASE_DIR \
- && rm $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION-bin.tar.gz \
+RUN curl -fSL $MINIFI_BINARY_URL -o $MINIFI_BASE_DIR/${MINIFI_BINARY} \
+ && echo "$(curl $MINIFI_BINARY_URL.sha256)
*$MINIFI_BASE_DIR/${MINIFI_BINARY}" | sha256sum -c - \
+ && unzip $MINIFI_BASE_DIR/${MINIFI_BINARY} -d $MINIFI_BASE_DIR \
+ && rm $MINIFI_BASE_DIR/${MINIFI_BINARY} \
&& ln -s $MINIFI_BASE_DIR/minifi-$MINIFI_VERSION $MINIFI_HOME
RUN chown -R -L minifi:minifi $MINIFI_HOME
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 88ccf31683..1e8cd3d82a 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
+++ b/nifi-registry/nifi-registry-core/nifi-registry-docker/dockerhub/Dockerfile
@@ -22,12 +22,13 @@ LABEL site="https://nifi.apache.org";
ARG UID=1000
ARG GID=1000
-ARG NIFI_REGISTRY_VERSION=1.16.0
+ARG NIFI_REGISTRY_VERSION=1.17.0
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_PATH
nifi/${NIFI_REGISTRY_VERSION}/nifi-registry-${NIFI_REGISTRY_VERSION}-bin.tar.gz
+ENV NIFI_REGISTRY_BINARY nifi-registry-${NIFI_REGISTRY_VERSION}-bin.zip
+ENV NIFI_REGISTRY_BINARY_PATH
nifi/${NIFI_REGISTRY_VERSION}/${NIFI_REGISTRY_BINARY}
ENV NIFI_REGISTRY_BINARY_URL ${MIRROR}/${NIFI_REGISTRY_BINARY_PATH}
ADD sh/ ${NIFI_REGISTRY_BASE_DIR}/scripts/
@@ -37,15 +38,15 @@ RUN groupadd -g ${GID} nifi || groupmod -n nifi `getent
group ${GID} | cut -d: -
&& useradd --shell /bin/bash -u ${UID} -g ${GID} -m nifi \
&& chown -R nifi:nifi ${NIFI_REGISTRY_BASE_DIR} \
&& apt-get update -y \
- && apt-get install -y curl jq xmlstarlet
+ && apt-get install -y curl jq xmlstarlet unzip
USER nifi
# Download, validate, and expand Apache NiFi-Registry binary.
-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 \
+RUN curl -fSL ${NIFI_REGISTRY_BINARY_URL} -o
${NIFI_REGISTRY_BASE_DIR}/${NIFI_REGISTRY_BINARY} \
+ && echo "$(curl ${NIFI_REGISTRY_BINARY_URL}.sha256)
*${NIFI_REGISTRY_BASE_DIR}/${NIFI_REGISTRY_BINARY}" | sha256sum -c - \
+ && unzip ${NIFI_REGISTRY_BASE_DIR}/${NIFI_REGISTRY_BINARY} -d
${NIFI_REGISTRY_BASE_DIR} \
+ && rm ${NIFI_REGISTRY_BASE_DIR}/${NIFI_REGISTRY_BINARY} \
&& mv ${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION}
${NIFI_REGISTRY_HOME} \
&& ln -s ${NIFI_REGISTRY_HOME}
${NIFI_REGISTRY_BASE_DIR}/nifi-registry-${NIFI_REGISTRY_VERSION} \
&& chown -R nifi:nifi ${NIFI_REGISTRY_HOME}
diff --git a/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
b/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
index 7495c23dd0..32acb63407 100644
--- a/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
+++ b/nifi-toolkit/nifi-toolkit-assembly/docker/Dockerfile.hub
@@ -22,12 +22,13 @@ LABEL site="https://nifi.apache.org";
ARG UID=1000
ARG GID=1000
-ARG NIFI_TOOLKIT_VERSION=1.16.0
+ARG NIFI_TOOLKIT_VERSION=1.17.0
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}
-ENV NIFI_TOOLKIT_BINARY_PATH
nifi/${NIFI_TOOLKIT_VERSION}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz
+ENV NIFI_TOOLKIT_BINARY nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.zip
+ENV NIFI_TOOLKIT_BINARY_PATH
nifi/${NIFI_TOOLKIT_VERSION}/${NIFI_TOOLKIT_BINARY}
ENV NIFI_TOOLKIT_BINARY_URL ${MIRROR}/${NIFI_TOOLKIT_BINARY_PATH}
ADD sh/docker-entrypoint.sh /opt/sh/docker-entrypoint.sh
@@ -39,10 +40,10 @@ RUN apk add --update curl bash jq openssl \
&& addgroup -g $GID nifi \
&& adduser -D -s /bin/ash -u $UID -G nifi nifi \
&& mkdir -p ${NIFI_TOOLKIT_BASE_DIR} \
- && curl -fSL ${NIFI_TOOLKIT_BINARY_URL} -o
${NIFI_TOOLKIT_BASE_DIR}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz \
- && echo "$(curl ${NIFI_TOOLKIT_BINARY_URL}.sha256)
*${NIFI_TOOLKIT_BASE_DIR}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz" |
sha256sum -c - \
- && tar -xvzf
${NIFI_TOOLKIT_BASE_DIR}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz -C
${NIFI_TOOLKIT_BASE_DIR} \
- && rm
${NIFI_TOOLKIT_BASE_DIR}/nifi-toolkit-${NIFI_TOOLKIT_VERSION}-bin.tar.gz \
+ && curl -fSL ${NIFI_TOOLKIT_BINARY_URL} -o
${NIFI_TOOLKIT_BASE_DIR}/${NIFI_TOOLKIT_BINARY} \
+ && echo "$(curl ${NIFI_TOOLKIT_BINARY_URL}.sha256)
*${NIFI_TOOLKIT_BASE_DIR}/${NIFI_TOOLKIT_BINARY}" | sha256sum -c - \
+ && unzip ${NIFI_TOOLKIT_BASE_DIR}/${NIFI_TOOLKIT_BINARY} -d
${NIFI_TOOLKIT_BASE_DIR} \
+ && rm ${NIFI_TOOLKIT_BASE_DIR}/${NIFI_TOOLKIT_BINARY} \
&& chown -R nifi:nifi ${NIFI_TOOLKIT_BASE_DIR}
USER nifi
