This is an automated email from the ASF dual-hosted git repository. chriss 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 36da257e56 NIFI-11667 Provide default NiFi version when building dockerhub image 36da257e56 is described below commit 36da257e56e07cfce6c204d2b8e3ead347e51db5 Author: Mathew Kiprop <mathewkipro...@gmail.com> AuthorDate: Thu Jun 8 19:42:57 2023 +0300 NIFI-11667 Provide default NiFi version when building dockerhub image Signed-off-by: Chris Sampson <chris.sampso...@gmail.com> This closes #7361 --- nifi-docker/dockerhub/DockerBuild.sh | 2 +- nifi-docker/dockerhub/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nifi-docker/dockerhub/DockerBuild.sh b/nifi-docker/dockerhub/DockerBuild.sh index 09806b02cd..557da17711 100755 --- a/nifi-docker/dockerhub/DockerBuild.sh +++ b/nifi-docker/dockerhub/DockerBuild.sh @@ -27,7 +27,7 @@ DISTRO_PATH="${5:-}" DOCKER_IMAGE="$(grep -Ev '(^#|^\s*$|^\s*\t*#)' DockerImage.txt)" NIFI_IMAGE_VERSION="$(echo "${DOCKER_IMAGE}" | cut -d : -f 2)" if [ -z "${DISTRO_PATH}" ]; then - DISTRO_PATH="${NIFI_VERSION}" + DISTRO_PATH="${NIFI_IMAGE_VERSION}" fi echo "Building NiFi Image: '${DOCKER_IMAGE}' Version: '${NIFI_IMAGE_VERSION}' Mirror: '${MIRROR}' Base: '${BASE} Path: '${DISTRO_PATH}' User/Group: '${DOCKER_UID}/${DOCKER_GID}'" diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile index 243c114b48..61db651783 100644 --- a/nifi-docker/dockerhub/Dockerfile +++ b/nifi-docker/dockerhub/Dockerfile @@ -29,8 +29,8 @@ ARG NIFI_VERSION=2.0.0 ARG BASE_URL=https://archive.apache.org/dist ARG MIRROR_BASE_URL=${MIRROR_BASE_URL:-${BASE_URL}} ARG DISTRO_PATH=${DISTRO_PATH:-${NIFI_VERSION}} -ARG NIFI_BINARY_PATH=${NIFI_BINARY_PATH:-/nifi/${DISTRO_PATH}/nifi-${NIFI_VERSION}-bin.zip} -ARG NIFI_TOOLKIT_BINARY_PATH=${NIFI_TOOLKIT_BINARY_PATH:-/nifi/${DISTRO_PATH}/nifi-toolkit-${NIFI_VERSION}-bin.zip} +ARG NIFI_BINARY_PATH=${NIFI_BINARY_PATH:-nifi/${DISTRO_PATH}/nifi-${NIFI_VERSION}-bin.zip} +ARG NIFI_TOOLKIT_BINARY_PATH=${NIFI_TOOLKIT_BINARY_PATH:-nifi/${DISTRO_PATH}/nifi-toolkit-${NIFI_VERSION}-bin.zip} ENV NIFI_BASE_DIR=/opt/nifi ENV NIFI_HOME ${NIFI_BASE_DIR}/nifi-current