From f1aba7e3853d9d5cebafa2bed13ebea86d99e11a Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Sat, 22 Aug 2020 15:04:38 +0200
Subject: [PATCH] add docker labels

---
 README.md        | 2 +-
 build-image.sh   | 1 +
 image/Dockerfile | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 81669ad..dd94ae1 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # vegardit/openldap <a href="https://github.com/vegardit/docker-openldap/" title="GitHub Repo"><img height="30" src="https://raw.githubusercontent.com/simple-icons/simple-icons/develop/icons/github.svg?sanitize=true"></a>
 
-[![Build Status](https://travis-ci.com/vegardit/docker-openldap.svg?branch=master "Tavis CI")](https://travis-ci.com/vegardit/docker-openldap)
+[![Build Status](https://travis-ci.com/vegardit/docker-openldap.svg?branch=master "Travis CI")](https://travis-ci.com/vegardit/docker-openldap)
 [![License](https://img.shields.io/github/license/vegardit/docker-openldap.svg?label=license)](#license)
 [![Docker Pulls](https://img.shields.io/docker/pulls/vegardit/openldap.svg)](https://hub.docker.com/r/vegardit/openldap)
 [![Docker Stars](https://img.shields.io/docker/stars/vegardit/openldap.svg)](https://hub.docker.com/r/vegardit/openldap)
diff --git a/build-image.sh b/build-image.sh
index e3658cf..c8f50a2 100644
--- a/build-image.sh
+++ b/build-image.sh
@@ -18,6 +18,7 @@ last_commit_date=$(date -d @$(git log -1 --format="%at") --utc +"%Y%m%d_%H%M%S")
 
 docker build $(dirname $0)/image \
    --compress \
+   --build-arg BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
    --build-arg GIT_BRANCH="${GIT_BRANCH:-$(git rev-parse --abbrev-ref HEAD)}" \
    --build-arg GIT_COMMIT_DATE="$(date -d @$(git log -1 --format='%at') --utc +'%Y-%m-%d %H:%M:%S UTC')" \
    --build-arg GIT_COMMIT_HASH="$(git rev-parse --short HEAD)" \
diff --git a/image/Dockerfile b/image/Dockerfile
index 043766c..39c24ef 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -39,7 +39,7 @@ RUN \
      apt-get update -y && \
      apt-get install --no-install-recommends -y libcomerr2 mc && \
      apt-get install --no-install-recommends -y htop less procps vim && \
-     echo 'set ignorecase\n\
+     echo -e 'set ignorecase\n\
 set showmatch\n\
 set novisualbell\n\
 set noerrorbells\n\
@@ -82,14 +82,17 @@ set mouse-=a' > ~/.vimrc; \
 
 VOLUME ["/etc/ldap/slapd.d", "/var/lib/ldap"]
 
+ARG BUILD_DATE
 ARG GIT_REPO_URL
 ARG GIT_BRANCH
 ARG GIT_COMMIT_HASH
 ARG GIT_COMMIT_DATE
 
 LABEL \
+  org.label-schema.schema-version="1.0" \
+  org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.vcs-ref=$GIT_COMMIT_HASH \
-  org.label-schema.vcs-url="https://github.com/vegardit/docker-openldap"
+  org.label-schema.vcs-url=$GIT_REPO_URL
 
 RUN \
   echo "GIT_REPO:   $GIT_REPO_URL" > /opt/build_info && \