This is an automated email from the ASF dual-hosted git repository.
jfrazee 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 160297f NIFI-7717 Add ARGs to Docker build for parent image and tag
160297f is described below
commit 160297f6ba47590afd68f54c8f352fe48fe56c10
Author: Mike Thomsen <[email protected]>
AuthorDate: Fri Aug 7 08:19:54 2020 -0400
NIFI-7717 Add ARGs to Docker build for parent image and tag
This closes #4460
Signed-off-by: Joey Frazee <[email protected]>
---
nifi-docker/dockerhub/Dockerfile | 8 +++++---
nifi-docker/dockerhub/pom.xml | 11 ++++++++++-
nifi-docker/dockermaven/Dockerfile | 12 ++++++++----
nifi-docker/dockermaven/pom.xml | 11 ++++++++++-
4 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/nifi-docker/dockerhub/Dockerfile b/nifi-docker/dockerhub/Dockerfile
index 065faac..6fa58a9 100644
--- a/nifi-docker/dockerhub/Dockerfile
+++ b/nifi-docker/dockerhub/Dockerfile
@@ -15,9 +15,11 @@
# specific language governing permissions and limitations
# under the License.
#
-
-FROM openjdk:8-jre
-LABEL maintainer="Apache NiFi <[email protected]>"
+ARG IMAGE_NAME=openjdk
+ARG IMAGE_TAG=8-jre
+FROM ${IMAGE_NAME}:${IMAGE_TAG}
+ARG MAINTAINER="Apache NiFi <[email protected]>"
+LABEL maintainer="${MAINTAINER}"
LABEL site="https://nifi.apache.org";
ARG UID=1000
diff --git a/nifi-docker/dockerhub/pom.xml b/nifi-docker/dockerhub/pom.xml
index 8b59ea2..3481e56 100644
--- a/nifi-docker/dockerhub/pom.xml
+++ b/nifi-docker/dockerhub/pom.xml
@@ -20,6 +20,12 @@
<artifactId>dockerhub</artifactId>
+ <properties>
+ <docker.image.name>openjdk</docker.image.name>
+ <docker.image.tag>8-jre</docker.image.tag>
+ <docker.maintainer><![CDATA[Apache NiFi
<[email protected]>]]></docker.maintainer>
+ </properties>
+
<profiles>
<profile>
<id>docker</id>
@@ -37,6 +43,9 @@
</goals>
<configuration>
<buildArgs>
+
<IMAGE_NAME>${docker.image.name}</IMAGE_NAME>
+
<IMAGE_TAG>${docker.image.tag}</IMAGE_TAG>
+
<MAINTAINER>${docker.maintainer}</MAINTAINER>
<UID>1000</UID>
<GID>1000</GID>
<NIFI_VERSION>1.7.0</NIFI_VERSION>
@@ -118,4 +127,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/nifi-docker/dockermaven/Dockerfile
b/nifi-docker/dockermaven/Dockerfile
index 36262e9..40fbf92 100644
--- a/nifi-docker/dockermaven/Dockerfile
+++ b/nifi-docker/dockermaven/Dockerfile
@@ -16,8 +16,11 @@
# under the License.
#
-FROM openjdk:8-jre AS artifactbase
-LABEL maintainer="Apache NiFi <[email protected]>"
+ARG IMAGE_NAME=openjdk
+ARG IMAGE_TAG=8-jre
+FROM ${IMAGE_NAME}:${IMAGE_TAG} AS artifactbase
+ARG MAINTAINER="Apache NiFi <[email protected]>"
+LABEL maintainer="${MAINTAINER}"
ARG NIFI_VERSION
ARG NIFI_BINARY
@@ -53,8 +56,9 @@ RUN mkdir -p ${NIFI_HOME}/conf \
&& mkdir -p ${NIFI_HOME}/state \
&& mkdir -p ${NIFI_LOG_DIR}
-FROM openjdk:8-jre
-LABEL maintainer="Apache NiFi <[email protected]>"
+FROM ${IMAGE_NAME}:${IMAGE_TAG}
+ARG MAINTAINER="Apache NiFi <[email protected]>"
+LABEL maintainer="${MAINTAINER}"
ARG UID=1000
ARG GID=1000
diff --git a/nifi-docker/dockermaven/pom.xml b/nifi-docker/dockermaven/pom.xml
index 9846645..4fa54d4 100644
--- a/nifi-docker/dockermaven/pom.xml
+++ b/nifi-docker/dockermaven/pom.xml
@@ -20,6 +20,12 @@
<artifactId>dockermaven</artifactId>
+ <properties>
+ <docker.image.name>openjdk</docker.image.name>
+ <docker.image.tag>8-jre</docker.image.tag>
+ <docker.maintainer><![CDATA[Apache NiFi
<[email protected]>]]></docker.maintainer>
+ </properties>
+
<profiles>
<profile>
<id>docker</id>
@@ -37,6 +43,9 @@
</goals>
<configuration>
<buildArgs>
+
<IMAGE_NAME>${docker.image.name}</IMAGE_NAME>
+
<IMAGE_TAG>${docker.image.tag}</IMAGE_TAG>
+
<MAINTAINER>${docker.maintainer}</MAINTAINER>
<UID>1000</UID>
<GID>1000</GID>
<NIFI_VERSION>${project.version}</NIFI_VERSION>
@@ -158,4 +167,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
