From 9423cf6f2392073d3191c1b5b90a2648fb917a72 Mon Sep 17 00:00:00 2001
From: Julien Cabillot <gitlab@cabillot.eu>
Date: Fri, 22 Feb 2019 22:10:53 +0000
Subject: [PATCH] test label

---
 .gitlab-ci.yml | 12 ++++++++++--
 Dockerfile     | 23 +++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5ffdad..fe03d58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,11 @@ before_script:
 build-master:
   stage: "build"
   script:
-    - "docker build --pull -t \"$CI_REGISTRY_IMAGE\" ."
+    - "docker build --pull \
+        --build-arg VCS_REF=`git rev-parse HEAD` \
+        --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+        --build-arg VERSION=`git describe --tags --exact-match || git rev-parse HEAD` \
+        -t \"$CI_REGISTRY_IMAGE\" ."
     - "docker push \"$CI_REGISTRY_IMAGE\""
   only:
     - "master"
@@ -17,7 +21,11 @@ build-master:
 build:
   stage: "build"
   script:
-    - "docker build --pull -t \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\" ."
+    - "docker build --pull \
+        --build-arg VCS_REF=`git rev-parse HEAD` \
+        --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
+        --build-arg VERSION=`git describe --tags --exact-match || git rev-parse HEAD` \
+        -t \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\" ."
     - "docker push \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\""
   except:
     - "master"
diff --git a/Dockerfile b/Dockerfile
index 77c67d6..a0c9537 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,26 @@
 FROM "python:3.7-alpine"
-MAINTAINER "Julien Cabillot <julien@sdv.fr>"
+LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
 
 RUN apk --no-cache add --virtual build-dependencies \
         build-base libffi-dev libressl-dev && \
     pip install --no-cache-dir ansible-lint ansible-lint-junit && \
-    apk del build-dependencies
\ No newline at end of file
+    apk del build-dependencies
+
+LABEL "maintainer"="dockerimages@cabillot.eu" \
+      "org.label-schema.name"="ansible-lint" \
+      "org.label-schema.base-image.name"="docker.io/library/python" \
+      "org.label-schema.base-image.version"="3.7-alpine" \
+      "org.label-schema.description"="Ansible-lint in a container" \
+      "org.label-schema.url"="https://github.com/ansible/ansible-lint" \
+      "org.label-schema.vcs-url"="https://gitlab.cabillot.eu/jcabillot/ansible-lint/" \
+      "org.label-schema.vendor"="Julien Cabillot" \
+      "org.label-schema.schema-version"="1.0" \
+      "org.label-schema.applications.ansiblelint.version"="latest" \
+      "org.label-schema.vcs-ref"=$VCS_REF \
+      "org.label-schema.version"=$VERSION \
+      "org.label-schema.build-date"=$BUILD_DATE \
+      "org.label-schema.usage"="docker run --rm -v $(pwd):/data registry.cabillot.eu/jcabillot/ansible-lint -p ."
\ No newline at end of file