From 29edf62a5a11b024c1f38e293cfe38a790fc2eba Mon Sep 17 00:00:00 2001 From: Gareth Flowers Date: Wed, 16 Oct 2019 22:09:18 +0100 Subject: [PATCH] feat(version): read version from version file --- Dockerfile | 3 ++- VERSION | 1 + hooks/build | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 VERSION diff --git a/Dockerfile b/Dockerfile index 3da189e..835770e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ FROM mediawiki:1.33.1 ARG BUILD_DATE +ARG VERSION ARG VCS_REF LABEL org.label-schema.build-date=$BUILD_DATE \ @@ -12,7 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url="https://github.com/garethflowers/docker-mediawiki-ldap" \ org.label-schema.vendor="garethflowers" \ - org.label-schema.version="0.0.0" + org.label-schema.version=$VERSION RUN apt-get update \ && apt-get install -y --no-install-recommends libldap2-dev libpq-dev \ diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..8acdd82 --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.1 diff --git a/hooks/build b/hooks/build index 2716b0a..32865f2 100644 --- a/hooks/build +++ b/hooks/build @@ -3,6 +3,7 @@ docker build \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ --build-arg VCS_REF=`git rev-parse --short HEAD` \ + --build-arg VERSION=`cat VERSION` \ --file $DOCKERFILE_PATH \ --tag $IMAGE_NAME \ .