Add info labels to the ElasTest docker images.

Jenkinsfile

@@ -30,7 +30,9 @@ node('docker'){
             stage "Build Rest Java API image - Package"
                 echo ("building..")
                 // def rest_api_image = docker.build("elastest/edm:0.5","./rest-java")
-                def rest_api_image = docker.build("elastest/edm:latest","./rest-java")
+                //def rest_api_image = docker.build("elastest/edm:latest","./rest-java")
+                sh 'cd rest-java; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm:latest'
+                def rest_api_image = docker.image('elastest/edm:latest')
 
             // stage "Build Rest API image - Package"
             //     echo ("building..")
@@ -40,31 +42,43 @@ node('docker'){
                 echo ("building..")
                 sh 'chmod +x alluxio/entrypoint.sh'
                 // def alluxio_image = docker.build("elastest/edm-alluxio:0.1","./alluxio")
-                def alluxio_image = docker.build("elastest/edm-alluxio:latest","./alluxio")
+                //def alluxio_image = docker.build("elastest/edm-alluxio:latest","./alluxio")
+                sh 'cd alluxio; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm-alluxio:latest'
+                def alluxio_image = docker.image('elastest/edm-alluxio:latest')
 
             stage "Build Hadoop image - Package"
                 echo ("building..")
                 // def hadoop_image = docker.build("elastest/edm-hadoop:0.1","./hadoop")
-                def hadoop_image = docker.build("elastest/edm-hadoop:latest","./hadoop")
+                // def hadoop_image = docker.build("elastest/edm-hadoop:latest","./hadoop")
+                sh 'cd hadoop; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm-hadoop:latest'
+                def hadoop_image = docker.image('elastest/edm-hadoop:latest')
 
             stage "Build Elasticsearch image - Package"
                 echo ("building..")
                 // def elasticsearch_image = docker.build("elastest/edm-elasticsearch:0.1","./elasticsearch")
-                def elasticsearch_image = docker.build("elastest/edm-elasticsearch:latest","./elasticsearch")
+                //def elasticsearch_image = docker.build("elastest/edm-elasticsearch:latest","./elasticsearch")
+                sh 'cd elasticsearch; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm-elasticsearch:latest'
+                def elasticsearch_image = docker.image('elastest/edm-elasticsearch:latest')
 
             stage "Build Kibana image - Package"
                 echo ("building..")
                 // def kibana_image = docker.build("elastest/edm-kibana:0.1","./kibana")
-                def kibana_image = docker.build("elastest/edm-kibana:latest","./kibana")
+                //def kibana_image = docker.build("elastest/edm-kibana:latest","./kibana")
+                sh 'cd kibana; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm-kibana:latest'
+                def kibana_image = docker.image('elastest/edm-kibana:latest')
 
             stage "Build Cerebro image - Package"
                 echo ("building..")
                 // def cerebro_image = docker.build("elastest/edm-cerebro:0.1","./cerebro")
-                def cerebro_image = docker.build("elastest/edm-cerebro:latest","./cerebro")
+                //def cerebro_image = docker.build("elastest/edm-cerebro:latest","./cerebro")
+                sh 'cd cerebro; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm-cerebro:latest'
+                def cerebro_image = docker.image('elastest/edm-cerebro:latest')
 
             stage "Build MySQL image - Package"
-               echo ("building..")
-               def mysql_image = docker.build("elastest/edm-mysql:latest","./mysql")
+                echo ("building..")
+                //def mysql_image = docker.build("elastest/edm-mysql:latest","./mysql")
+                sh 'cd mysql; docker build --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg COMMIT_DATE=$(git log -1 --format=%cd --date=format:%Y-%m-%dT%H:%M:%S) . -t elastest/edm-mysql:latest'
+                def mysql_image = docker.image('elastest/edm-mysql:latest')
 
             // stage "Run EDM docker-compose"
             //     sh 'chmod +x bin/* && bin/teardown-ci.sh && bin/startup-ci.sh'

alluxio/Dockerfile

@@ -11,6 +11,16 @@
 
 FROM openjdk:7-jdk-alpine
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
+
 RUN apk add --update bash && \
     # apk add --update git && \
     # apk add --update mvn && \

cerebro/Dockerfile

@@ -1,5 +1,14 @@
 FROM openjdk:8-jre
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
 # grab gosu for easy step-down from root
 # ENV GOSU_VERSION 1.7
 # RUN set -x \

elasticsearch/Dockerfile

@@ -1,6 +1,16 @@
 # https://github.com/elastic/elasticsearch-docker
 FROM docker.elastic.co/elasticsearch/elasticsearch:5.4.1
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
+
 # Add your elasticsearch plugins setup here
 # Example: RUN elasticsearch-plugin install analysis-icu
 RUN elasticsearch-plugin remove x-pack

hadoop/Dockerfile

@@ -1,5 +1,15 @@
 FROM ubuntu:14.04
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
+
 
 ####################
 # JAVA

kibana/Dockerfile

@@ -1,6 +1,16 @@
 # https://github.com/elastic/kibana-docker
 FROM docker.elastic.co/kibana/kibana:5.4.1
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
+
 # Add your kibana plugins setup here
 # Example: RUN kibana-plugin install <name|url>
 #RUN kibana-plugin install x-pack

mysql/Dockerfile

@@ -1,5 +1,15 @@
 
 FROM mysql:5.7
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
+
 ADD init /docker-entrypoint-initdb.d/
 ADD config/* /etc/mysql/conf.d/

rest-java/Dockerfile

@@ -1,6 +1,16 @@
 FROM tomcat:8.5-jre8
 MAINTAINER Savas Gioldasis ([email protected])
 
+# Set Image Labels
+ARG GIT_COMMIT=unspecified
+LABEL git_commit=$GIT_COMMIT
+
+ARG COMMIT_DATE=unspecified
+LABEL commit_date=$COMMIT_DATE
+
+ARG VERSION=unspecified
+LABEL version=$VERSION 
+
 # RUN ["rm", "-fr", "/usr/local/tomcat/webapps/ROOT"]
 # COPY ./target/your-webapp-1.0-SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war