refactor(docker): improve docker image build

Author: fhussonnois

Dockerfile

@@ -1,7 +1,39 @@
+
+# Copyright 2019-2020 StreamThoughts.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Kafka Connect File Pulse
 FROM confluentinc/cp-kafka-connect-base:5.2.1
 
-COPY connect-file-pulse-plugin/target/components/packages/streamthoughts-kafka-connect-file-pulse-1.3.0-SNAPSHOT.zip /tmp/kafka-connect-file-pulse.zip
+ARG connectFilePulseVersion
+ARG connectFilePulseBranch
+ARG connectFilePulseCommit
+
+ENV FILE_PULSE_VERSION="${connectFilePulseVersion}" \
+    FILE_PULSE_COMMIT="${connectFilePulseCommit}" \
+    FILE_PULSE_BRANCH="${connectFilePulseBranch}"
+
+COPY connect-file-pulse-plugin/target/components/packages/streamthoughts-kafka-connect-file-pulse-${FILE_PULSE_VERSION}.zip /tmp/kafka-connect-file-pulse.zip
 RUN confluent-hub install --no-prompt /tmp/kafka-connect-file-pulse.zip && \
     rm -rf /tmp/kafka-connect-file-pulse.zip
 
 COPY include/docker/connect-log4j.properties.template /etc/confluent/docker/log4j.properties.template
+
+LABEL io.streamthoughts.docker.name="kafka-connect-file-pulse" \
+      io.streamthoughts.docker.version=$FILE_PULSE_VERSION \
+      io.streamthoughts.docker.branch=$FILE_PULSE_BRANCH \
+      io.streamthoughts.docker.commit=$FILE_PULSE_COMMIT

Makefile

@@ -1,6 +1,8 @@
 # Makefile used to build docker images for Connect File Pulse
 
 CONNECT_VERSION := $(shell mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout)
+GIT_COMMIT := $(shell git rev-parse --short HEAD)
+GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 
 REPOSITORY = streamthoughts
 IMAGE = kafka-connect-file-pulse
@@ -26,9 +28,14 @@ clean-build:
 build-images:
 	echo "Building image \n========================================== ";
 	echo "CONNECT_VERSION="$(CONNECT_VERSION)
+	echo "GIT_COMMIT="$(GIT_COMMIT)
+	echo "GIT_BRANCH="$(GIT_BRANCH)
 	echo "==========================================\n "
-	mvn clean package && \
+	mvn clean package -q && \
 	docker build \
+    --build-arg connectFilePulseVersion=${CONNECT_VERSION} \
+    --build-arg connectFilePulseCommit=${GIT_COMMIT} \
+    --build-arg connectFilePulseBranch=${GIT_BRANCH} \
 	-t ${REPOSITORY}/${IMAGE}:latest . || exit 1 ;
 	docker tag ${REPOSITORY}/${IMAGE}:latest ${REPOSITORY}/${IMAGE}:${CONNECT_VERSION} || exit 1 ;